From eee58d187e2c55fca6f53b9e482d33cf5346fe81 Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 26 Nov 2014 13:08:24 +0000
Subject: Change the way Perl modules are installed, update the default Perl to
 5.18.

Before, we had:

  site_perl :           lib/perl5/site_perl/5.18
  site_perl/perl_arch : lib/perl5/site_perl/5.18/mach
  perl_man3 :           lib/perl5/5.18/man/man3

Now we have:

  site_perl : lib/perl5/site_perl
  site_arch : lib/perl5/site_perl/mach/5.18
  perl_man3 : lib/perl5/site_perl/man/man3

Modules without any .so will be installed at the same place regardless of the
Perl version, minimizing the upgrade when the major Perl version is changed.
It uses a version dependent directory for modules with compiled bits.

As PERL_ARCH is no longer needed in plists, it has been removed from
PLIST_SUB.

The USE_PERL5=fixpacklist keyword is removed, the .packlist file is now
always removed, as is perllocal.pod.

The old site_perl and site_perl/arch directories have been kept in the
default Perl @INC for all Perl ports, and will be phased out as these old
Perl versions expire.

PR:		194969
Differential Revision:	https://reviews.freebsd.org/D1019
Exp-run by:	antoine
Reviewed by:	perl@
Approved by:	portmgr
---
 devel/git/Makefile  | 5 +----
 devel/git/pkg-plist | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'devel/git')

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 352840405a78..50103c844955 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG
 MASTER_SITE_SUBDIR=	software/scm/git
@@ -237,7 +238,6 @@ post-install:
 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
 .endif
-	-${RM} -f ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/mach/perllocal.pod
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
@@ -260,8 +260,5 @@ post-install:
 .endif
 
 post-stage:
-.if ${PORT_OPTIONS:MPERL}
-	${FIND} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto -name .packlist -exec ${SED} -i '' 's|^${STAGEDIR}||' '{}' \;
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 6166cf73bcec..606e04c03285 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -371,7 +371,6 @@ libexec/git-core/mergetools/emerge
 libexec/git-core/mergetools/araxis
 %%GUI%%bin/gitk
 %%PERLSUB%%%%SITE_PERL%%/Git.pm
-%%PERLSUB%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist
 %%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/SVN.pm
 %%PERLSUB%%%%SITE_PERL%%/Git/IndexInfo.pm
-- 
cgit v1.2.3