svn commit: r384051 - in head/lang/perl5.20: . files

[Mathieu Arnold]

Author: mat
Date: Wed Apr 15 13:46:34 2015
New Revision: 384051
URL: https://svnweb.freebsd.org/changeset/ports/384051

Log:
  Only add the PKGINSTALL/DEINSTALL on 8.4.  While there, move a few things
  before port.pre.mk that had no place after it.
  
  Sponsored by:	Absolight

Modified:
  head/lang/perl5.20/Makefile
  head/lang/perl5.20/files/use.perl.in

Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile	Wed Apr 15 13:35:43 2015	(r384050)
+++ head/lang/perl5.20/Makefile	Wed Apr 15 13:46:34 2015	(r384051)
@@ -3,7 +3,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	${PERL_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	CPAN/../../src/5.0
 DIST_SUBDIR=	perl
@@ -110,26 +110,10 @@ SUB_LIST+=	PERL_VERSION=${PERL_VERSION} 
 		SITEMAN3PREFIX=${SITE_MAN3_PREFIX} \
 		PERL_ARCH=${PERL_ARCH}
 
-SUB_FILES=	perl5_version use.perl perl-man.conf
+SUB_FILES=	perl5_version
 
-PKGINSTALL=	${WRKDIR}/use.perl
-PKGDEINSTALL=	${WRKDIR}/use.perl
 INSTALL_TARGET=	install-strip
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
-
-# if this port is default due PERL5_DEFAULT
-# change PKGNAME to reflect this
-.if ${PERL_VER} == ${PERL5_DEFAULT}
-PKGNAMESUFFIX=	${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
-.else
-# make PKGNAME unique among other lang/perl5.x
-PKGNAMESUFFIX=	${PERL_VER}
-# always add default perl5 pkgname to conflicts
-CONFLICTS_INSTALL+=	perl5-*
-.endif
-
 .if defined(PERL_VENDOR_PREFIX)
 CONFIGURE_ARGS+=	\
 	-Dvendorprefix=${PERL_VENDOR_PREFIX} \
@@ -162,15 +146,34 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION}
 		PRIV_LIB=${_PRIV_LIB} \
 		ARCH_LIB=${_ARCH_LIB}
 
-.if ${PORT_OPTIONS:MDEBUG}
-STRIP=
-STRIP_CMD=	${TRUE}
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+
+# if this port is default due PERL5_DEFAULT
+# change PKGNAME to reflect this
+.if ${PERL_VER} == ${PERL5_DEFAULT}
+PKGNAMESUFFIX=	${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//}
+.else
+# make PKGNAME unique among other lang/perl5.x
+PKGNAMESUFFIX=	${PERL_VER}
+# always add default perl5 pkgname to conflicts
+CONFLICTS_INSTALL+=	perl5-*
 .endif
 
 .if ${OSVERSION} >= 900022
+SUB_FILES+=	perl-man.conf
 PLIST_SUB+=	MANCONF=""
 .else
+# FIXME when 8.4 goes out, remove this
+SUB_FILES+=	use.perl
 PLIST_SUB+=	MANCONF="@comment "
+PKGINSTALL=	${WRKDIR}/use.perl
+PKGDEINSTALL=	${WRKDIR}/use.perl
+.endif
+
+.if ${PORT_OPTIONS:MDEBUG}
+STRIP=
+STRIP_CMD=	${TRUE}
 .endif
 
 # Put a symlink to the future libperl.so.x.yy so that -lperl works.

Modified: head/lang/perl5.20/files/use.perl.in
==============================================================================
--- head/lang/perl5.20/files/use.perl.in	Wed Apr 15 13:35:43 2015	(r384050)
+++ head/lang/perl5.20/files/use.perl.in	Wed Apr 15 13:46:34 2015	(r384051)
@@ -33,12 +33,10 @@ do_spam_manpath()
 
 
 if [ "$2" = "POST-INSTALL" ] ; then
-	if [ "${OSVERSION}" -lt 900022 ] ; then
-		do_cleanup_manpath
-		do_spam_manpath
-	fi
+	do_cleanup_manpath
+	do_spam_manpath
 elif [ "$2" = "POST-DEINSTALL" ] ; then
-	[ "${OSVERSION}" -lt 900022 ] && do_cleanup_manpath
+	do_cleanup_manpath
 fi
 
 exit 0