Date: Mon, 30 Sep 2013 21:53:56 +0000 (UTC) From: Matthew Seaman <matthew@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328879 - in head/www: p5-RT-Authen-ExternalAuth p5-RT-Authen-ExternalAuth/files p5-RT-Extension-LDAPImport p5-RT-Extension-LDAPImport/files p5-RT-Extension-SLA p5-RT-Extension-SLA/file... Message-ID: <201309302153.r8ULruVX061291@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: matthew Date: Mon Sep 30 21:53:55 2013 New Revision: 328879 URL: http://svnweb.freebsd.org/changeset/ports/328879 Log: - stagify the last 4 remaining of my ports - Add patch for a bug in Module::Import::RTx which doesn't take any account of ${DESTDIR}. This is a known bug upstream which hasn't been fixed in 7 years or so since it was first reported... https://rt.cpan.org/Public/Bug/Display.html?id=12964 Added: head/www/p5-RT-Authen-ExternalAuth/files/ head/www/p5-RT-Authen-ExternalAuth/files/patch-inc_Module_Install_RTx.pm (contents, props changed) head/www/p5-RT-Extension-LDAPImport/files/ head/www/p5-RT-Extension-LDAPImport/files/patch-inc_Module_Install_RTx.pm (contents, props changed) head/www/p5-RT-Extension-SLA/files/patch-inc_Module_Install_RTx.pm (contents, props changed) head/www/p5-RTx-Calendar/files/ head/www/p5-RTx-Calendar/files/patch-inc_Module_Install_RTx.pm (contents, props changed) Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile head/www/p5-RT-Authen-ExternalAuth/pkg-plist (contents, props changed) head/www/p5-RT-Extension-LDAPImport/Makefile head/www/p5-RT-Extension-LDAPImport/pkg-plist (contents, props changed) head/www/p5-RT-Extension-SLA/Makefile head/www/p5-RT-Extension-SLA/pkg-plist (contents, props changed) head/www/p5-RTx-Calendar/Makefile head/www/p5-RTx-Calendar/pkg-plist (contents, props changed) Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile ============================================================================== --- head/www/p5-RT-Authen-ExternalAuth/Makefile Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Authen-ExternalAuth/Makefile Mon Sep 30 21:53:55 2013 (r328879) @@ -23,7 +23,6 @@ USE_PERL5= configure OPTIONS_DEFINE= RT38 RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRT38} @@ -36,20 +35,19 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PO RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} MAN3PREFIX= ${PREFIX} -MAN3= RT::Authen::ExternalAuth.3 \ - RT::Authen::ExternalAuth::DBI.3 \ - RT::Authen::ExternalAuth::DBI::Cookie.3 \ - RT::Authen::ExternalAuth::LDAP.3 PLIST_SUB+= RTHOME=share/rt${RT_VER} # Note: You can install using an arbitrary $PREFIX but only if it # matches the $PREFIX used to install www/rt{38,40}. Hence ignore # $PREFIX in the environment and inherit settings from RT.pm + do-configure: @cd ${CONFIGURE_WRKSRC} && \ unset PREFIX && \ ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ - ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile + ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//;' \ + -e 's,^DESTDIR = ,DESTDIR = ${STAGEDIR},;' Makefile + .include <bsd.port.mk> Added: head/www/p5-RT-Authen-ExternalAuth/files/patch-inc_Module_Install_RTx.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/p5-RT-Authen-ExternalAuth/files/patch-inc_Module_Install_RTx.pm Mon Sep 30 21:53:55 2013 (r328879) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- inc/Module/Install/RTx.pm.orig ++++ inc/Module/Install/RTx.pm +@@ -101,7 +101,7 @@ + my %index = map { $_ => 1 } @INDEX_DIRS; + $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; + +- my $args = join ', ', map "q($_)", map { ($_, $path{$_}) } ++ my $args = join ', ', map "q($_)", map { ($_, "\${DESTDIR}$path{$_}") } + grep $subdirs{$_}, keys %path; + + print "./$_\t=> $path{$_}\n" for sort keys %subdirs; Modified: head/www/p5-RT-Authen-ExternalAuth/pkg-plist ============================================================================== --- head/www/p5-RT-Authen-ExternalAuth/pkg-plist Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Authen-ExternalAuth/pkg-plist Mon Sep 30 21:53:55 2013 (r328879) @@ -1,4 +1,3 @@ -man/auto/RT/Authen/ExternalAuth/.packlist %%RTHOME%%/plugins/RT-Authen-ExternalAuth/etc/RT_SiteConfig.pm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/html/Callbacks/ExternalAuth/Elements/Header/Head %%RTHOME%%/plugins/RT-Authen-ExternalAuth/html/Callbacks/ExternalAuth/autohandler/Auth @@ -8,6 +7,11 @@ man/auto/RT/Authen/ExternalAuth/.packlis %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen/ExternalAuth/DBI.pm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen/ExternalAuth/DBI/Cookie.pm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen/ExternalAuth/LDAP.pm +man/man3/RT::Authen::ExternalAuth.3.gz +man/man3/RT::Authen::ExternalAuth::DBI.3.gz +man/man3/RT::Authen::ExternalAuth::DBI::Cookie.3.gz +man/man3/RT::Authen::ExternalAuth::LDAP.3.gz +man/auto/RT/Authen/ExternalAuth/.packlist.gz @dirrm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen/ExternalAuth/DBI @dirrm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen/ExternalAuth @dirrm %%RTHOME%%/plugins/RT-Authen-ExternalAuth/lib/RT/Authen Modified: head/www/p5-RT-Extension-LDAPImport/Makefile ============================================================================== --- head/www/p5-RT-Extension-LDAPImport/Makefile Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Extension-LDAPImport/Makefile Mon Sep 30 21:53:55 2013 (r328879) @@ -23,7 +23,6 @@ USE_PERL5= configure OPTIONS_DEFINE= RT38 RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRT38} @@ -37,7 +36,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORT MAN3PREFIX= ${PREFIX} -MAN3= RT::Extension::LDAPImport.3 PLIST_SUB+= RTHOME=share/rt${RT_VER} # Note: You can install using an arbitrary $PREFIX but only if it Added: head/www/p5-RT-Extension-LDAPImport/files/patch-inc_Module_Install_RTx.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/p5-RT-Extension-LDAPImport/files/patch-inc_Module_Install_RTx.pm Mon Sep 30 21:53:55 2013 (r328879) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- inc/Module/Install/RTx.pm.orig ++++ inc/Module/Install/RTx.pm +@@ -101,7 +101,7 @@ + my %index = map { $_ => 1 } @INDEX_DIRS; + $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; + +- my $args = join ', ', map "q($_)", map { ($_, $path{$_}) } ++ my $args = join ', ', map "q($_)", map { ($_, "\${DESTDIR}$path{$_}") } + grep $subdirs{$_}, keys %path; + + print "./$_\t=> $path{$_}\n" for sort keys %subdirs; Modified: head/www/p5-RT-Extension-LDAPImport/pkg-plist ============================================================================== --- head/www/p5-RT-Extension-LDAPImport/pkg-plist Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Extension-LDAPImport/pkg-plist Mon Sep 30 21:53:55 2013 (r328879) @@ -1,6 +1,7 @@ %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT/Extension/LDAPImport.pm %%RTHOME%%/plugins/RT-Extension-LDAPImport/bin/rtldapimport -man/auto/RT/Extension/LDAPImport/.packlist +man/auto/RT/Extension/LDAPImport/.packlist.gz +man/man3/RT::Extension::LDAPImport.3.gz @dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT/Extension @dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib/RT @dirrm %%RTHOME%%/plugins/RT-Extension-LDAPImport/lib Modified: head/www/p5-RT-Extension-SLA/Makefile ============================================================================== --- head/www/p5-RT-Extension-SLA/Makefile Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Extension-SLA/Makefile Mon Sep 30 21:53:55 2013 (r328879) @@ -23,7 +23,6 @@ USE_PERL5= configure OPTIONS_DEFINE= RT38 RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRT38} @@ -35,19 +34,6 @@ RT_VER= 40 BUILD_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER} -MAN3PREFIX= ${PREFIX} - -MAN3= RT::Action::SLA.3 \ - RT::Action::SLA_SetDefault.3 \ - RT::Action::SLA_SetDue.3 \ - RT::Action::SLA_SetStarts.3 \ - RT::Condition::SLA.3 \ - RT::Condition::SLA_RequireDefault.3 \ - RT::Condition::SLA_RequireDueSet.3 \ - RT::Condition::SLA_RequireStartsSet.3 \ - RT::Extension::SLA.3 \ - RT::Queue_SLA.3 - PLIST_SUB+= RTHOME=share/rt${RT_VER} SUB_LIST+= RTHOME=share/rt${RT_VER} @@ -64,7 +50,4 @@ do-configure: ${SETENV} ${CONFIGURE_ENV} ${PERL5} -I${SITE_PERL} ./${CONFIGURE_SCRIPT} && \ ${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile -post-install: - ${CAT} ${PKGMESSAGE} - .include <bsd.port.mk> Added: head/www/p5-RT-Extension-SLA/files/patch-inc_Module_Install_RTx.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/p5-RT-Extension-SLA/files/patch-inc_Module_Install_RTx.pm Mon Sep 30 21:53:55 2013 (r328879) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- inc/Module/Install/RTx.pm.orig ++++ inc/Module/Install/RTx.pm +@@ -100,7 +100,7 @@ + my %index = map { $_ => 1 } @INDEX_DIRS; + $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; + +- my $args = join ', ', map "q($_)", map { ($_, $path{$_}) } ++ my $args = join ', ', map "q($_)", map { ($_, "\${DESTDIR}$path{$_}") } + grep $subdirs{$_}, keys %path; + + print "./$_\t=> $path{$_}\n" for sort keys %subdirs; Modified: head/www/p5-RT-Extension-SLA/pkg-plist ============================================================================== --- head/www/p5-RT-Extension-SLA/pkg-plist Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RT-Extension-SLA/pkg-plist Mon Sep 30 21:53:55 2013 (r328879) @@ -1,4 +1,3 @@ -man/auto/RT/Extension/SLA/.packlist %%RTHOME%%/plugins/RT-Extension-SLA/etc/initialdata %%RTHOME%%/plugins/RT-Extension-SLA/etc/upgrade/0.06/content %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Action/SLA.pm @@ -13,6 +12,17 @@ man/auto/RT/Extension/SLA/.packlist %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension/SLA/Test.pm.in %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension/SLA.pm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Queue_SLA.pm +man/man3/RT::Action::SLA.3.gz +man/man3/RT::Action::SLA_SetDefault.3.gz +man/man3/RT::Action::SLA_SetDue.3.gz +man/man3/RT::Action::SLA_SetStarts.3.gz +man/man3/RT::Condition::SLA.3.gz +man/man3/RT::Condition::SLA_RequireDefault.3.gz +man/man3/RT::Condition::SLA_RequireDueSet.3.gz +man/man3/RT::Condition::SLA_RequireStartsSet.3.gz +man/man3/RT::Extension::SLA.3.gz +man/man3/RT::Queue_SLA.3.gz +man/auto/RT/Extension/SLA/.packlist.gz @dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension/SLA @dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Extension @dirrm %%RTHOME%%/plugins/RT-Extension-SLA/lib/RT/Condition Modified: head/www/p5-RTx-Calendar/Makefile ============================================================================== --- head/www/p5-RTx-Calendar/Makefile Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RTx-Calendar/Makefile Mon Sep 30 21:53:55 2013 (r328879) @@ -24,7 +24,6 @@ USE_PERL5= configure OPTIONS_DEFINE= RT38 RT38_DESC= Install for rt-3.8.x (default rt-4.0.x) -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MRT38} @@ -38,7 +37,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/rt:${PORT MAN3PREFIX= ${PREFIX} -MAN3= RTx::Calendar.3 PLIST_SUB+= RTHOME=share/rt${RT_VER} post-patch: Added: head/www/p5-RTx-Calendar/files/patch-inc_Module_Install_RTx.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/p5-RTx-Calendar/files/patch-inc_Module_Install_RTx.pm Mon Sep 30 21:53:55 2013 (r328879) @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- inc/Module/Install/RTx.pm.orig ++++ inc/Module/Install/RTx.pm +@@ -101,7 +101,7 @@ + my %index = map { $_ => 1 } @INDEX_DIRS; + $self->no_index( directory => $_ ) foreach grep !$index{$_}, @DIRS; + +- my $args = join ', ', map "q($_)", map { ($_, $path{$_}) } ++ my $args = join ', ', map "q($_)", map { ($_, "\${DESTDIR}$path{$_}") } + grep $subdirs{$_}, keys %path; + + print "./$_\t=> $path{$_}\n" for sort keys %subdirs; Modified: head/www/p5-RTx-Calendar/pkg-plist ============================================================================== --- head/www/p5-RTx-Calendar/pkg-plist Mon Sep 30 21:37:18 2013 (r328878) +++ head/www/p5-RTx-Calendar/pkg-plist Mon Sep 30 21:53:55 2013 (r328879) @@ -19,7 +19,8 @@ %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Ticket/Elements/Tabs/Default %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Tabs/Privileged %%RTHOME%%/plugins/RTx-Calendar/html/Callbacks/RTx-Calendar/Elements/Header/Head -man/auto/RTx/Calendar/.packlist +man/man3/RTx::Calendar.3.gz +man/auto/RTx/Calendar/.packlist.gz @dirrm %%RTHOME%%/plugins/RTx-Calendar/lib/RTx @dirrm %%RTHOME%%/plugins/RTx-Calendar/lib @dirrm %%RTHOME%%/plugins/RTx-Calendar/html/Search
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309302153.r8ULruVX061291>