diff options
| -rw-r--r-- | devel/RTx-RightsMatrix/Makefile | 5 | ||||
| -rw-r--r-- | devel/RTx-RightsMatrix/distinfo | 4 | ||||
| -rw-r--r-- | devel/RTx-RightsMatrix/patches/patch-aa | 12 | ||||
| -rw-r--r-- | devel/RTx-Shredder/Makefile | 5 | ||||
| -rw-r--r-- | devel/RTx-Shredder/distinfo | 4 | ||||
| -rw-r--r-- | devel/RTx-Shredder/patches/patch-aa | 7 |
6 files changed, 23 insertions, 14 deletions
diff --git a/devel/RTx-RightsMatrix/Makefile b/devel/RTx-RightsMatrix/Makefile index b43c1d1b8c1..00adfa70c78 100644 --- a/devel/RTx-RightsMatrix/Makefile +++ b/devel/RTx-RightsMatrix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/08/21 16:33:08 seb Exp $ +# $NetBSD: Makefile,v 1.5 2011/06/26 09:54:40 wiz Exp $ # DISTNAME= RTx-RightsMatrix-0.03.00 @@ -13,6 +13,9 @@ COMMENT= Utility to efficiently manage rights to a RT installation DEPENDS+= rt>=3.4.5:../../devel/rt3 +PKG_DESTDIR_SUPPORT= user-destdir +MAKE_ENV+= DESTDIR=${DESTDIR} + .include "../../devel/rt3/dirs.mk" PLIST_SUBST+= RT_SHARE_DIR=share/rt3 diff --git a/devel/RTx-RightsMatrix/distinfo b/devel/RTx-RightsMatrix/distinfo index 41d8afb4dd0..ea89041a75d 100644 --- a/devel/RTx-RightsMatrix/distinfo +++ b/devel/RTx-RightsMatrix/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/05/01 09:43:11 cube Exp $ +$NetBSD: distinfo,v 1.2 2011/06/26 09:54:40 wiz Exp $ SHA1 (RTx-RightsMatrix-0.03.00.tgz) = 95345e935293d90bdd1d08a60290f72e0e5c0b94 RMD160 (RTx-RightsMatrix-0.03.00.tgz) = f85820289db564eb887e44830e08276db62cff9a Size (RTx-RightsMatrix-0.03.00.tgz) = 29898 bytes -SHA1 (patch-aa) = 5230c031f94d6f3af8f1b7afdd14a96dbd7def1f +SHA1 (patch-aa) = 2cae70586bf0a4bf95ec89898add5a268a62c197 diff --git a/devel/RTx-RightsMatrix/patches/patch-aa b/devel/RTx-RightsMatrix/patches/patch-aa index ee728aecb0e..b43118c5946 100644 --- a/devel/RTx-RightsMatrix/patches/patch-aa +++ b/devel/RTx-RightsMatrix/patches/patch-aa @@ -1,13 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/05/01 09:43:11 cube Exp $ +$NetBSD: patch-aa,v 1.2 2011/06/26 09:54:40 wiz Exp $ ---- inc/Module/Install/RTx.pm.orig 2005-09-27 00:23:22.000000000 +0200 +--- inc/Module/Install/RTx.pm.orig 2005-10-28 20:04:16.000000000 +0000 +++ inc/Module/Install/RTx.pm -@@ -29,7 +29,8 @@ sub RTx { +@@ -28,8 +28,9 @@ sub RTx { + @ARGV = grep { /PREFIX=(.*)/ ? (($prefix = $1), 0) : 1 } @ARGV; if ($prefix) { - $RT::LocalPath = $prefix; +- $RT::LocalPath = $prefix; - $INC{'RT.pm'} = "$RT::LocalPath/lib/RT.pm"; -+ $RT::LocalHtmlPath = "$prefix/share/rt3/html"; ++ $RT::LocalPath = "$ENV{DESTDIR}$prefix"; ++ $RT::LocalHtmlPath = "$ENV{DESTDIR}$prefix/share/rt3/html"; + $INC{'RT.pm'} = "$RT::LocalPath/lib/rt3/RT.pm"; } else { diff --git a/devel/RTx-Shredder/Makefile b/devel/RTx-Shredder/Makefile index 74b3d00b290..3ac122be533 100644 --- a/devel/RTx-Shredder/Makefile +++ b/devel/RTx-Shredder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/08/21 16:33:08 seb Exp $ +# $NetBSD: Makefile,v 1.6 2011/06/26 09:56:36 wiz Exp $ # DISTNAME= RTx-Shredder-0.03 @@ -14,6 +14,9 @@ DEPENDS+= rt>=3.4.5:../../devel/rt3 BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep BUILD_DEPENDS+= p5-DBD-SQLite-[0-9]*:../../databases/p5-DBD-SQLite +PKG_DESTDIR_SUPPORT= user-destdir +MAKE_ENV+= DESTDIR=${DESTDIR} + .include "../../devel/rt3/dirs.mk" PKG_USERS_VARS+= APACHE_USER diff --git a/devel/RTx-Shredder/distinfo b/devel/RTx-Shredder/distinfo index 17428854993..4be885a4b34 100644 --- a/devel/RTx-Shredder/distinfo +++ b/devel/RTx-Shredder/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2006/05/01 09:42:13 cube Exp $ +$NetBSD: distinfo,v 1.2 2011/06/26 09:56:36 wiz Exp $ SHA1 (RTx-Shredder-0.03.tar.gz) = e0bb6dd1128d5d6603c1d434456bddbe3de748da RMD160 (RTx-Shredder-0.03.tar.gz) = 43d5aabccea3e24f971962123a0df587fa98847c Size (RTx-Shredder-0.03.tar.gz) = 43315 bytes -SHA1 (patch-aa) = 5230c031f94d6f3af8f1b7afdd14a96dbd7def1f +SHA1 (patch-aa) = 281a8fe1e0c46f0df36e05e88ab52d77ad4c5d9d diff --git a/devel/RTx-Shredder/patches/patch-aa b/devel/RTx-Shredder/patches/patch-aa index 120ac7318f2..808046926bb 100644 --- a/devel/RTx-Shredder/patches/patch-aa +++ b/devel/RTx-Shredder/patches/patch-aa @@ -1,13 +1,14 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/05/01 09:42:13 cube Exp $ +$NetBSD: patch-aa,v 1.2 2011/06/26 09:56:36 wiz Exp $ --- inc/Module/Install/RTx.pm.orig 2005-09-27 00:23:22.000000000 +0200 +++ inc/Module/Install/RTx.pm @@ -29,7 +29,8 @@ sub RTx { if ($prefix) { - $RT::LocalPath = $prefix; +- $RT::LocalPath = $prefix; - $INC{'RT.pm'} = "$RT::LocalPath/lib/RT.pm"; -+ $RT::LocalHtmlPath = "$prefix/share/rt3/html"; ++ $RT::LocalPath = "$ENV{DESTDIR}$prefix"; ++ $RT::LocalHtmlPath = "$ENV{DESTDIR}$prefix/share/rt3/html"; + $INC{'RT.pm'} = "$RT::LocalPath/lib/rt3/RT.pm"; } else { |