svn commit: r414041 - head/lang/perl5.20

[Mathieu Arnold]

Author: mat
Date: Tue Apr 26 09:40:17 2016
New Revision: 414041
URL: https://svnweb.freebsd.org/changeset/ports/414041

Log:
  Simplify the Makefile.
  
  Sponsored by:	Absolight

Modified:
  head/lang/perl5.20/Makefile   (contents, props changed)

Modified: head/lang/perl5.20/Makefile
==============================================================================
--- head/lang/perl5.20/Makefile	Tue Apr 26 09:10:21 2016	(r414040)
+++ head/lang/perl5.20/Makefile	Tue Apr 26 09:40:17 2016	(r414041)
@@ -83,6 +83,7 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} 
 	-Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
 	-Dsiteman3dir=${SITE_MAN3} \
 	-Dsiteman1dir=${SITE_MAN1} \
+	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} \
 	-Ui_malloc -Ui_iconv -Uinstallusrbinperl -Dusenm=n \
 	-Dcc="${CC}" -Duseshrplib -Dinc_version_list=none \
 	-Dcf_by=${MAINTAINER:C, at .*,,} -Dcf_email=${MAINTAINER} \
@@ -93,9 +94,6 @@ CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} 
 CONFIGURE_ARGS+= \
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-Wl,-rpath=${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL:R)'
-# When upgrading to 5.22+ remove this.
-CONFIGURE_ARGS+= \
-	-Dotherlibdirs=${PREFIX}/lib/perl5/site_perl/${PERL_VER}:${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}
 
 LOCALE_CLEANUP=	LANG="" LC_ALL="" LC_COLLATE="" LC_CTYPE="" \
 		LC_MESSAGES="" LC_MONETARY="" LC_NUMERIC="" \