Make the Makefile more compliant with how things need to be ordered.

1 files changed, 82 insertions, 84 deletions

diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index 23be109b01a6..bf534a8c2b80 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -27,9 +27,11 @@ LICENSE_FILE_GPLv1+ =	${WRKSRC}/Copying
 #DEPRECATED=	Support end three years after .0 release, please upgrade to a more recent version of Perl
 #EXPIRATION_DATE=<Release date of .0 + 3 years>
 
-TEST_TARGET=	test_harness
-TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
-		LD_LIBRARY_PATH=${WRKSRC}
+# XXX releases are .tar.xz, add: tar:xz
+USES=	cpe
+
+# Give a hint of where libperl.so can be found.
+USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
 
 # XXX Remove github things.
 USE_GITHUB=	yes
@@ -37,70 +39,13 @@ GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
 GH_TAGNAME=	v5.29.10-9-g07ba20f405
 
-OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \
-		THREADS PERL_MALLOC DTRACE DOT_INC
-OPTIONS_DEFAULT=	PERL_64BITINT THREADS MULTIPLICITY DTRACE
-
-.if !exists(/usr/sbin/dtrace)
-OPTIONS_EXCLUDE+=	DTRACE
-.endif
-.for a in aarch64 arm armeb armv6 armv7 mips mips64 mips64el mipsel mipsn32 powerpc \
-	powerpc64 sparc64
-OPTIONS_EXCLUDE_${a}=	DTRACE
-.endfor
-
-EXCLUSIVE_DESC=	Exclusive OPTIONS
-GDBM_DESC=	GDBM_File extension
-PERL_MALLOC_DESC=	Use Perl malloc
-PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
-THREADS_DESC=		Build threaded perl
-MULTIPLICITY_DESC=	Use multiplicity
-SITECUSTOMIZE_DESC=	Run-time customization of @INC
-DOT_INC_DESC=		Add '.' to @INC (unsafe)
-
-OPTIONS_SUB=		yes
-DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
-DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
-DTRACE_CONFIGURE_ON=	-Dusedtrace
-DTRACE_CONFIGURE_OFF=	-Uusedtrace
-GDBM_CONFIGURE_ON=	-Di_gdbm
-GDBM_CONFIGURE_OFF=	-Ui_gdbm
-GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
-PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
-MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
-MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
-SITECUSTOMIZE_CONFIGURE_ON=	-Dusesitecustomize
-THREADS_CONFIGURE_ON=	-Dusethreads=y
-THREADS_CONFIGURE_OFF=	-Dusethreads=n
-PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
-PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
-DOT_INC_CONFIGURE_ON=		-Ddefault_inc_excludes_dot=n
+TEST_TARGET=	test_harness
+TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
+		LD_LIBRARY_PATH=${WRKSRC}
 
 # XXX uncomment PORTSCOUT line
 #PORTSCOUT=	limit:^${PERL_VER}.
 
-.include "version.mk"
-PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
-PERL_ARCH=	mach
-SITE_PERL_REL?=	lib/perl5/site_perl
-SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
-SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
-SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
-SITE_MAN_PREFIX=	${SITE_PERL_REL}
-SITE_MAN3_REL?=	${SITE_MAN_PREFIX}/man/man3
-SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
-SITE_MAN1_REL?=	${SITE_MAN_PREFIX}/man/man1
-SITE_MAN1?=	${PREFIX}/${SITE_MAN1_REL}
-
-_PRIV_LIB=	lib/perl5/${PERL_VER}
-_ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
-
-# XXX releases are .tar.xz, add: tar:xz
-USES=	cpe
-
-# XXX replace all LIBPERL_VER occurences with PERL_VERSION
-LIBPERL_VER=	${PORTVERSION:C/[^0-9.]//}
-
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=Configure
 CONFIGURE_ARGS=	-sde -Dprefix=${PREFIX} \
@@ -125,21 +70,11 @@ CONFIGURE_ARGS+=	\
 	-Alddlflags='-L${WRKSRC} -L${PREFIX}/${_ARCH_LIB}/CORE -lperl' \
 	-Dshrpldflags='$$(LDDLFLAGS:N-L${WRKSRC}:N-L${PREFIX}/${_ARCH_LIB}/CORE:N-lperl) -Wl,-soname,$$(LIBPERL)'
 
-# Give a hint of where libperl.so can be found.
-USE_LDCONFIG=	${PREFIX}/${_ARCH_LIB}/CORE
-
 # XXX Remove
 CONFIGURE_ARGS+=	-Dusedevel -Uversiononly
 
-CONFIGURE_ENV+=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
-
-SUB_LIST+=	PERL_VERSION=${PERL_VERSION} \
-		PERL_VER=${PERL_VER} \
-		SITE_PERL=${SITE_PERL_REL} \
-		PRIV_LIB=${_PRIV_LIB} \
-		PERLMANPREFIX=${PERLMANPREFIX_REL} \
-		SITEMANPREFIX=${SITE_MAN_PREFIX} \
-		PERL_ARCH=${PERL_ARCH}
+# When built from a git repository, newvers.sh can put a = in the version.
+CONFIGURE_ENV=	UNAME_v="$$(uname -v | sed 'y/=/ /')"
 
 SUB_FILES=	perl-man.conf
 
@@ -162,11 +97,7 @@ CONFIGURE_ARGS+=	\
     -Accflags=-DPERLIOBUF_DEFAULT_BUFSIZ=${PERLIOBUF_DEFAULT_BUFSIZ}
 .endif
 
-PERLMANPREFIX_REL=	${_PRIV_LIB}/perl
-PERLMANPREFIX=	${PREFIX}/${PERLMANPREFIX_REL}
-MANDIRS+=	${PERLMANPREFIX}/man
-
-PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
+PLIST_SUB=	PERL_VERSION=${PERL_VERSION} \
 		PERL_VER=${PERL_VER} \
 		PERL_ARCH=${PERL_ARCH} \
 		PERL_ARCH_regex=\b${PERL_ARCH}\b \
@@ -183,6 +114,76 @@ PLIST_SUB+=	PERL_VERSION=${PERL_VERSION} \
 # XXX Remove and change to PERL_VERSION in the plist.
 PLIST_SUB+=	LIBPERL_VER=${LIBPERL_VER}
 
+SUB_LIST=	PERL_VERSION=${PERL_VERSION} \
+		PERL_VER=${PERL_VER} \
+		SITE_PERL=${SITE_PERL_REL} \
+		PRIV_LIB=${_PRIV_LIB} \
+		PERLMANPREFIX=${PERLMANPREFIX_REL} \
+		SITEMANPREFIX=${SITE_MAN_PREFIX} \
+		PERL_ARCH=${PERL_ARCH}
+
+.include "version.mk"
+PERL_VER?=	${PERL_VERSION:C/\.[0-9]+$//}
+PERL_ARCH=	mach
+SITE_PERL_REL?=	lib/perl5/site_perl
+SITE_PERL?=	${PREFIX}/${SITE_PERL_REL}
+SITE_ARCH_REL?=	${SITE_PERL_REL}/${PERL_ARCH}/${PERL_VER}
+SITE_ARCH?=	${PREFIX}/${SITE_ARCH_REL}
+SITE_MAN_PREFIX=	${SITE_PERL_REL}
+SITE_MAN3_REL?=	${SITE_MAN_PREFIX}/man/man3
+SITE_MAN3?=	${PREFIX}/${SITE_MAN3_REL}
+SITE_MAN1_REL?=	${SITE_MAN_PREFIX}/man/man1
+SITE_MAN1?=	${PREFIX}/${SITE_MAN1_REL}
+
+_PRIV_LIB=	lib/perl5/${PERL_VER}
+_ARCH_LIB=	${_PRIV_LIB}/${PERL_ARCH}
+
+PERLMANPREFIX_REL=	${_PRIV_LIB}/perl
+PERLMANPREFIX=	${PREFIX}/${PERLMANPREFIX_REL}
+MANDIRS=	${PERLMANPREFIX}/man
+
+# XXX replace all LIBPERL_VER occurences with PERL_VERSION
+LIBPERL_VER=	${PORTVERSION:C/[^0-9.]//}
+
+OPTIONS_DEFINE=	DEBUG GDBM PERL_64BITINT MULTIPLICITY SITECUSTOMIZE \
+		THREADS PERL_MALLOC DTRACE DOT_INC
+OPTIONS_DEFAULT=	PERL_64BITINT THREADS MULTIPLICITY DTRACE
+
+.if !exists(/usr/sbin/dtrace)
+OPTIONS_EXCLUDE=	DTRACE
+.endif
+.for a in aarch64 arm armeb armv6 armv7 mips mips64 mips64el mipsel mipsn32 powerpc \
+	powerpc64 sparc64
+OPTIONS_EXCLUDE_${a}=	DTRACE
+.endfor
+
+EXCLUSIVE_DESC=	Exclusive OPTIONS
+GDBM_DESC=	GDBM_File extension
+PERL_MALLOC_DESC=	Use Perl malloc
+PERL_64BITINT_DESC=	Use 64 bit integers (on i386)
+THREADS_DESC=		Build threaded perl
+MULTIPLICITY_DESC=	Use multiplicity
+SITECUSTOMIZE_DESC=	Run-time customization of @INC
+DOT_INC_DESC=		Add '.' to @INC (unsafe)
+
+OPTIONS_SUB=		yes
+DEBUG_CONFIGURE_ON=	-Doptimize="-g" -DDEBUGGING
+DEBUG_CONFIGURE_OFF=	-Doptimize="${CFLAGS}"
+DTRACE_CONFIGURE_ON=	-Dusedtrace
+DTRACE_CONFIGURE_OFF=	-Uusedtrace
+GDBM_CONFIGURE_ON=	-Di_gdbm
+GDBM_CONFIGURE_OFF=	-Ui_gdbm
+GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
+PERL_64BITINT_CONFIGURE_ON=	-Duse64bitint
+MULTIPLICITY_CONFIGURE_ON=	-Dusemultiplicity=y
+MULTIPLICITY_CONFIGURE_OFF=	-Dusemultiplicity=n
+SITECUSTOMIZE_CONFIGURE_ON=	-Dusesitecustomize
+THREADS_CONFIGURE_ON=	-Dusethreads=y
+THREADS_CONFIGURE_OFF=	-Dusethreads=n
+PERL_MALLOC_CONFIGURE_ON=	-Dusemymalloc=y
+PERL_MALLOC_CONFIGURE_OFF=	-Dusemymalloc=n
+DOT_INC_CONFIGURE_ON=		-Ddefault_inc_excludes_dot=n
+
 # Why this is required is explained in:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=227356#c5
 _PERL5_DEFAULT_FILE=	/tmp/PERL5_DEFAULT
@@ -198,11 +199,8 @@ PKGNAMESUFFIX=	5
 IAMDEFAULTPERL=	yes
 .else
 # make PKGNAME unique among other lang/perl5.x
-.if defined(GH_TAGNAME) # XXX remove if, leave only the else.
 PKGNAMESUFFIX=	5-devel
-.else
-PKGNAMESUFFIX=	${PERL_VER}
-.endif
+#PKGNAMESUFFIX=	${PERL_VER} # XXX remove the previous, leave only this.
 .endif
 
 # Am I building the default Perl ?