Date: Wed, 03 Nov 2010 05:22:47 -0700 (PDT) From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: skv@FreeBSD.org Subject: ports/151914: [PATCH] lang/perl: Adjust man configuration for 9.0-current >= 900022 Message-ID: <20101103122243.69873.qmail@botelhor.bplab.local> Resent-Message-ID: <201011031230.oA3CU9XS059114@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151914
>Category: ports
>Synopsis: [PATCH] lang/perl: Adjust man configuration for 9.0-current >= 900022
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 03 12:30:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
FreeBSD.org
>Environment:
System: FreeBSD botelhor.bplab.local 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r214446M: Thu Oct 28 09:25:17 BRST
>Description:
Man tools were updated on 900022 and manpath.config was replaced by
/usr/local/etc/man.d/*.conf. Adjust perl 5.12 port to install a perl.conf
instead of hacking manpath.config.
Similar change must be provided ffor perl 5.10 and 5.8 ports.
Added file(s):
- files/perl.conf.in
Port maintainer (skv@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- perl-5.12.2_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/perl5.12/Makefile,v
retrieving revision 1.125
diff -u -u -r1.125 Makefile
--- Makefile 13 Oct 2010 12:47:59 -0000 1.125
+++ Makefile 3 Nov 2010 12:20:46 -0000
@@ -65,6 +65,14 @@
.include "Makefile.man"
.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 900022
+PLIST_SUB+= MANCONF=""
+SUB_FILES+= perl.conf
+SUB_LIST+= PERL_VERSION=${PERL_VERSION}
+.else
+PLIST_SUB+= MANCONF="@comment "
+.endif
+
.if defined(PERL_VENDOR_PREFIX)
CONFIGURE_ARGS+= \
-Dvendorprefix=${PERL_VENDOR_PREFIX} \
@@ -201,6 +209,10 @@
${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${BSDPAN_WRKSRC}/${files} ${BSDPAN_DEST}/${files}
.endfor
+.if ${OSVERSION} >= 900022
+ @${MKDIR} ${PREFIX}/etc/man.d
+ ${INSTALL_DATA} ${WRKDIR}/perl.conf ${PREFIX}/etc/man.d/perl.conf
+.endif
PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
test: build
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/perl5.12/pkg-plist,v
retrieving revision 1.49
diff -u -u -r1.49 pkg-plist
--- pkg-plist 15 Sep 2010 16:21:30 -0000 1.49
+++ pkg-plist 3 Nov 2010 12:20:46 -0000
@@ -40,6 +40,7 @@
bin/shasum
bin/splain
bin/xsubpp
+%%MANCONF%%etc/man.d/perl.conf
lib/perl5/%%PERL_VER%%/AnyDBM_File.pm
lib/perl5/%%PERL_VER%%/App/Cpan.pm
lib/perl5/%%PERL_VER%%/App/Prove.pm
@@ -2432,6 +2433,7 @@
@dirrm lib/perl5/%%PERL_VER%%/autodie/exception
@dirrm lib/perl5/%%PERL_VER%%/autodie
@dirrm lib/perl5/%%PERL_VER%%
+%%MANCONF%%@dirrmtry etc/man.d
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto
Index: files/perl.conf.in
===================================================================
RCS file: files/perl.conf.in
diff -N files/perl.conf.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/perl.conf.in 3 Nov 2010 12:20:46 -0000
@@ -0,0 +1,2 @@
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/man
+MANPATH %%PREFIX%%/lib/perl5/%%PERL_VERSION%%/perl/man
Index: files/use.perl
===================================================================
RCS file: /home/pcvs/ports/lang/perl5.12/files/use.perl,v
retrieving revision 1.16
diff -u -u -r1.16 use.perl
--- files/use.perl 16 Sep 2010 15:57:09 -0000 1.16
+++ files/use.perl 3 Nov 2010 12:20:46 -0000
@@ -21,14 +21,23 @@
need_remove_links=%%LINK_USRBIN%%
need_create_links=%%LINK_USRBIN%%
need_cleanup_make_conf=yes
- need_cleanup_manpath=yes
need_spam_make_conf=yes
- need_spam_manpath=yes
need_post_install=yes
+ if [ "${osreldate}" -lt 900022 ]; then
+ need_cleanup_manpath=yes
+ need_spam_manpath=yes
+ else
+ need_cleanup_manpath=no
+ need_spam_manpath=no
+ fi
elif [ "$2" = "POST-DEINSTALL" ] ; then
need_remove_links=%%LINK_USRBIN%%
need_cleanup_make_conf=yes
- need_cleanup_manpath=yes
+ if [ "${osreldate}" -lt 900022 ]; then
+ need_cleanup_manpath=yes
+ else
+ need_cleanup_manpath=no
+ fi
else
exit 0;
fi
--- perl-5.12.2_3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101103122243.69873.qmail>