diff options
author | seb <seb@pkgsrc.org> | 2006-06-03 10:40:34 +0000 |
---|---|---|
committer | seb <seb@pkgsrc.org> | 2006-06-03 10:40:34 +0000 |
commit | 10353c08284d65f7de7b0cf52f5ba70f481599a6 (patch) | |
tree | cefedb902187df4bf35f3870820548d4f44efa57 /devel/rt3 | |
parent | 6970432831cc8a07171d507256a7ee5aa3a00767 (diff) | |
download | pkgsrc-10353c08284d65f7de7b0cf52f5ba70f481599a6.tar.gz |
Install sbin/rt-dump-database script.
Apply fix from
http://svn.bestpractical.com/cgi-bin/index.cgi/bps/revision?rev=5218
<< * get rid of "masks earlier declaration" warnings >>
Bump PKGREVISION to 1.
Approved by MAINTAINER.
Diffstat (limited to 'devel/rt3')
-rw-r--r-- | devel/rt3/Makefile | 4 | ||||
-rw-r--r-- | devel/rt3/Makefile.install | 5 | ||||
-rw-r--r-- | devel/rt3/PLIST | 3 | ||||
-rw-r--r-- | devel/rt3/distinfo | 5 | ||||
-rw-r--r-- | devel/rt3/patches/patch-ad | 34 | ||||
-rw-r--r-- | devel/rt3/patches/patch-ae | 13 | ||||
-rw-r--r-- | devel/rt3/patches/patch-af | 30 |
7 files changed, 88 insertions, 6 deletions
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile index a1aa983ba88..7cee85afae2 100644 --- a/devel/rt3/Makefile +++ b/devel/rt3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2006/05/01 09:38:08 cube Exp $ +# $NetBSD: Makefile,v 1.19 2006/06/03 10:40:34 seb Exp $ DISTNAME= rt-3.4.5 -PKGREVISION= # +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ diff --git a/devel/rt3/Makefile.install b/devel/rt3/Makefile.install index 5ed1bed4410..24e3ba22460 100644 --- a/devel/rt3/Makefile.install +++ b/devel/rt3/Makefile.install @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.install,v 1.5 2006/05/01 09:38:08 cube Exp $ +# $NetBSD: Makefile.install,v 1.6 2006/06/03 10:40:34 seb Exp $ .include "dirs.mk" @@ -71,7 +71,8 @@ do-install: ${WRKSRC}/bin/standalone_httpd ${WRKSRC}/bin/mason_handler.svc \ ${WRKSRC}/bin/rt ${WRKSRC}/bin/webmux.pl ${WRKSRC}/bin/rt-crontool \ ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/sbin/rt-setup-database \ + ${INSTALL_SCRIPT} ${WRKSRC}/sbin/rt-dump-database \ + ${WRKSRC}/sbin/rt-setup-database \ ${WRKSRC}/sbin/rt-test-dependencies ${PREFIX}/sbin @${ECHO} "=> HTML documents" ${INSTALL_DATA_DIR} ${RT_HTML_DIR} diff --git a/devel/rt3/PLIST b/devel/rt3/PLIST index deaa171cc8e..7a204c4f9cc 100644 --- a/devel/rt3/PLIST +++ b/devel/rt3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2006/05/01 09:38:08 cube Exp $ +@comment $NetBSD: PLIST,v 1.5 2006/06/03 10:40:34 seb Exp $ bin/mason_handler.fcgi bin/mason_handler.scgi bin/mason_handler.svc @@ -213,6 +213,7 @@ lib/rt3/t/regression/22search_tix_by_txn.t lib/rt3/t/regression/22search_tix_by_watcher.t lib/rt3/t/regression/mime_tests lib/rt3/t/setup_regression.t +sbin/rt-dump-database sbin/rt-setup-database sbin/rt-test-dependencies share/doc/rt3/README diff --git a/devel/rt3/distinfo b/devel/rt3/distinfo index d3101d693f3..405d9dada88 100644 --- a/devel/rt3/distinfo +++ b/devel/rt3/distinfo @@ -1,7 +1,10 @@ -$NetBSD: distinfo,v 1.6 2006/05/01 09:38:08 cube Exp $ +$NetBSD: distinfo,v 1.7 2006/06/03 10:40:34 seb Exp $ SHA1 (rt-3.4.5.tar.gz) = a2609ffc168829a179bea70006e57aee6d6367f9 RMD160 (rt-3.4.5.tar.gz) = aa86f6cd4039ce6f6fdfaabf0e2807e93d0786b5 Size (rt-3.4.5.tar.gz) = 1410154 bytes SHA1 (patch-aa) = 4d29c290658144dcd7aa08d87649681dd2549b43 SHA1 (patch-ac) = efa7095fe10e313a1578a1d739a8e77244c2ba6e +SHA1 (patch-ad) = 29b9d65af7c3e9357e0c3882493ce48fe26a5cc7 +SHA1 (patch-ae) = 42c83677004d045b6ae7d8eadc4fbb9c8062cb64 +SHA1 (patch-af) = 33f6c98c1db16bfb0c438cf2c03ee9f353b6ee33 diff --git a/devel/rt3/patches/patch-ad b/devel/rt3/patches/patch-ad new file mode 100644 index 00000000000..fb7a7c309e1 --- /dev/null +++ b/devel/rt3/patches/patch-ad @@ -0,0 +1,34 @@ +$NetBSD: patch-ad,v 1.1 2006/06/03 10:40:34 seb Exp $ + +--- lib/RT/Ticket_Overlay.pm.orig 2005-11-14 20:43:24.000000000 +0000 ++++ lib/RT/Ticket_Overlay.pm +@@ -3018,20 +3018,21 @@ sub SetOwner { + + $RT::Handle->Commit(); + +- my ( $trans, $msg, undef ) = $self->_NewTransaction( +- Type => $Type, +- Field => 'Owner', +- NewValue => $NewOwnerObj->Id, +- OldValue => $OldOwnerObj->Id, +- TimeTaken => 0 ); ++ ( $val, $msg ) = $self->_NewTransaction( ++ Type => $Type, ++ Field => 'Owner', ++ NewValue => $NewOwnerObj->Id, ++ OldValue => $OldOwnerObj->Id, ++ TimeTaken => 0, ++ ); + +- if ($trans) { ++ if ($val) { + $msg = $self->loc( "Owner changed from [_1] to [_2]", + $OldOwnerObj->Name, $NewOwnerObj->Name ); + + # TODO: make sure the trans committed properly + } +- return ( $trans, $msg ); ++ return ( $val, $msg ); + + } + diff --git a/devel/rt3/patches/patch-ae b/devel/rt3/patches/patch-ae new file mode 100644 index 00000000000..9cb36385aa4 --- /dev/null +++ b/devel/rt3/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2006/06/03 10:40:34 seb Exp $ + +--- lib/RT/Tickets_Overlay.pm.orig 2005-12-13 18:58:20.000000000 +0000 ++++ lib/RT/Tickets_Overlay.pm +@@ -918,7 +918,7 @@ sub _WatcherJoin { + # RT doesn't allow to add groups as members of the + # ticket roles, so we just hide entries in CGM table + # with MemberId == GroupId from results +- my $groupmembers = $self->SUPER::Limit( ++ $self->SUPER::Limit( + LEFTJOIN => $groupmembers, + FIELD => 'GroupId', + OPERATOR => '!=', diff --git a/devel/rt3/patches/patch-af b/devel/rt3/patches/patch-af new file mode 100644 index 00000000000..571fb276185 --- /dev/null +++ b/devel/rt3/patches/patch-af @@ -0,0 +1,30 @@ +$NetBSD: patch-af,v 1.1 2006/06/03 10:40:34 seb Exp $ + +--- lib/RT/CustomField_Overlay.pm.orig 2005-09-22 19:09:22.000000000 +0000 ++++ lib/RT/CustomField_Overlay.pm +@@ -876,10 +876,10 @@ sub AddToObject { + if ( $ObjectCF->Id ) { + return ( 0, $self->loc("That is already the current value") ); + } +- my ( $id, $msg ) = ++ my ( $oid, $msg ) = + $ObjectCF->Create( ObjectId => $id, CustomField => $self->Id ); + +- return ( $id, $msg ); ++ return ( $oid, $msg ); + } + + +@@ -911,9 +911,10 @@ sub RemoveFromObject { + unless ( $ObjectCF->Id ) { + return ( 0, $self->loc("This custom field does not apply to that object") ); + } +- my ( $id, $msg ) = $ObjectCF->Delete; ++ # XXX: Delete doesn't return anything ++ my ( $oid, $msg ) = $ObjectCF->Delete; + +- return ( $id, $msg ); ++ return ( $oid, $msg ); + } + + # {{{ AddValueForObject |