Date: Mon, 31 Mar 2014 22:26:09 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349811 - in head/lang: perl5.14 perl5.14/files perl5.16 perl5.16/files perl5.18 perl5.18/files Message-ID: <201403312226.s2VMQ909019311@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Mar 31 22:26:09 2014 New Revision: 349811 URL: http://svnweb.freebsd.org/changeset/ports/349811 QAT: https://qat.redports.org/buildarchive/r349811/ Log: - Remove temp file on deinstall[1] - Unshun all installation commands - Make PREFIX-clean Poked by: bdrewery [1] Sponsored by: Absolight Modified: head/lang/perl5.14/Makefile head/lang/perl5.14/files/use.perl.in head/lang/perl5.14/pkg-plist head/lang/perl5.16/Makefile head/lang/perl5.16/files/use.perl.in head/lang/perl5.16/pkg-plist head/lang/perl5.18/Makefile head/lang/perl5.18/files/use.perl.in head/lang/perl5.18/pkg-plist Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.14/Makefile Mon Mar 31 22:26:09 2014 (r349811) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -41,7 +41,7 @@ PERL_VERSION= 5.14.4 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} -SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} +SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} USE_BZIP2= yes HAS_CONFIGURE= yes @@ -110,8 +110,8 @@ MANDIRS+= ${MAN3PREFIX} PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${LOCALBASE}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||} + MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ + SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING @@ -197,25 +197,25 @@ post-patch: .endif post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys - @${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - @${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto + ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif .for files in ${BSDPAN_FILES} - @${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} + ${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} ${INSTALL_DATA} \ ${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files} .endfor test: build - @(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) + (cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) regression-test: test Modified: head/lang/perl5.14/files/use.perl.in ============================================================================== --- head/lang/perl5.14/files/use.perl.in Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.14/files/use.perl.in Mon Mar 31 22:26:09 2014 (r349811) @@ -54,6 +54,7 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config + /bin/rm /etc/manpath.config.bak fi } Modified: head/lang/perl5.14/pkg-plist ============================================================================== --- head/lang/perl5.14/pkg-plist Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.14/pkg-plist Mon Mar 31 22:26:09 2014 (r349811) @@ -3003,7 +3003,7 @@ man/man1/xsubpp.1.gz @dirrm lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils @dirrm lib/perl5/%%PERL_VER%%/BSDPAN @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true -@exec cd /usr/include && %D/bin/h2ph *.h machine/*.h sys/*.h >/dev/null +@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared @@ -3348,13 +3348,15 @@ man/man1/xsubpp.1.gz @exec /usr/bin/makewhatis %D/lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%% +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine @exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% -@dirrmtry %%SITE_PERL%%/auto @exec install -d %D/%%SITE_PERL%%/auto +@dirrmtry %%SITE_PERL%%/auto @dirrmtry %%SITE_PERL%% @dirrmtry lib/perl5/site_perl @dirrmtry lib/perl5 Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.16/Makefile Mon Mar 31 22:26:09 2014 (r349811) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -41,7 +41,7 @@ PERL_VERSION= 5.16.3 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} -SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} +SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} USE_BZIP2= yes HAS_CONFIGURE= yes @@ -110,8 +110,8 @@ MANDIRS+= ${MAN3PREFIX} PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${LOCALBASE}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||} + MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ + SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= -Doptimize="-g" -DDEBUGGING @@ -197,25 +197,25 @@ post-patch: .endif post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys - @${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - @${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto + ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif .for files in ${BSDPAN_FILES} - @${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} + ${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} ${INSTALL_DATA} \ ${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files} .endfor test: build - @(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) + (cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) regression-test: test Modified: head/lang/perl5.16/files/use.perl.in ============================================================================== --- head/lang/perl5.16/files/use.perl.in Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.16/files/use.perl.in Mon Mar 31 22:26:09 2014 (r349811) @@ -54,6 +54,7 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config + /bin/rm /etc/manpath.config.bak fi } Modified: head/lang/perl5.16/pkg-plist ============================================================================== --- head/lang/perl5.16/pkg-plist Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.16/pkg-plist Mon Mar 31 22:26:09 2014 (r349811) @@ -2913,7 +2913,7 @@ man/man1/zipdetails.1.gz @dirrm lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils @dirrm lib/perl5/%%PERL_VER%%/BSDPAN @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true -@exec cd /usr/include && %D/bin/h2ph *.h machine/*.h sys/*.h >/dev/null +@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared @@ -3251,13 +3251,15 @@ man/man1/zipdetails.1.gz @exec /usr/bin/makewhatis %D/lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%% +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine @exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% -@dirrmtry %%SITE_PERL%%/auto @exec install -d %D/%%SITE_PERL%%/auto +@dirrmtry %%SITE_PERL%%/auto @dirrmtry %%SITE_PERL%% @dirrmtry lib/perl5/site_perl @dirrmtry lib/perl5 Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.18/Makefile Mon Mar 31 22:26:09 2014 (r349811) @@ -3,7 +3,7 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel perl5 MASTER_SITES= CPAN \ ${MASTER_SITE_LOCAL:S/$/:local/} \ @@ -63,7 +63,7 @@ PERL_VERSION= 5.18.2 PERL_VER= ${PERL_VERSION:C/\.[0-9]+$//} PERL_ARCH= mach SITE_PERL_REL?= lib/perl5/site_perl/${PERL_VER} -SITE_PERL?= ${LOCALBASE}/${SITE_PERL_REL} +SITE_PERL?= ${PREFIX}/${SITE_PERL_REL} USE_BZIP2= yes HAS_CONFIGURE= yes @@ -132,8 +132,8 @@ MANDIRS+= ${MAN3PREFIX} PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ PERL_VER=${PERL_VER} \ PERL_ARCH=${PERL_ARCH} \ - MAN3=${MAN3PREFIX:S|^${LOCALBASE}/||}/man/man3 \ - SITE_PERL=${SITE_PERL:S|^${LOCALBASE}/||} + MAN3=${MAN3PREFIX:S|^${PREFIX}/||}/man/man3 \ + SITE_PERL=${SITE_PERL:S|^${PREFIX}/||} .if ${PORT_OPTIONS:MDEBUG} STRIP= @@ -182,25 +182,25 @@ post-patch: .endif post-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine - @${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys - @${MKDIR} ${STAGEDIR}${SITE_PERL}/auto - @${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/perl5/${PERL_VER}/man/man3 + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/auto + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/machine + ${MKDIR} ${STAGEDIR}${SITE_PERL}/${PERL_ARCH}/sys + ${MKDIR} ${STAGEDIR}${SITE_PERL}/auto + ${LN} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${STAGEDIR}${PREFIX}/bin/perl5 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc .if ${OSVERSION} >= 900022 ${INSTALL_DATA} ${WRKDIR}/perl-man.conf ${STAGEDIR}${PREFIX}/etc/man.d/perl${PERL_VER}.conf .endif .for files in ${BSDPAN_FILES} - @${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} + ${MKDIR} ${STAGEDIR}${BSDPAN_DEST}/${files:H} ${INSTALL_DATA} \ ${BSDPAN_WRKSRC}/${files} ${STAGEDIR}${BSDPAN_DEST}/${files} .endfor test: build - @(cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) + (cd ${WRKSRC}; TEST_JOBS=${MAKE_JOBS_NUMBER} make test_harness) regression-test: test Modified: head/lang/perl5.18/files/use.perl.in ============================================================================== --- head/lang/perl5.18/files/use.perl.in Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.18/files/use.perl.in Mon Mar 31 22:26:09 2014 (r349811) @@ -54,6 +54,7 @@ do_cleanup_manpath() { if (s != 1) { mode = 0 } if (mode == 0) print }' /etc/manpath.config >/etc/manpath.config.new /bin/mv /etc/manpath.config /etc/manpath.config.bak /bin/mv /etc/manpath.config.new /etc/manpath.config + /bin/rm /etc/manpath.config.bak fi } Modified: head/lang/perl5.18/pkg-plist ============================================================================== --- head/lang/perl5.18/pkg-plist Mon Mar 31 22:19:00 2014 (r349810) +++ head/lang/perl5.18/pkg-plist Mon Mar 31 22:26:09 2014 (r349811) @@ -2938,7 +2938,7 @@ man/man1/zipdetails.1.gz @dirrm lib/perl5/%%PERL_VER%%/BSDPAN/ExtUtils @dirrm lib/perl5/%%PERL_VER%%/BSDPAN @unexec find %D/%%SITE_PERL%%/%%PERL_ARCH%%/ -name '*.ph' -delete 2>/dev/null || true -@exec cd /usr/include && %D/bin/h2ph *.h machine/*.h sys/*.h >/dev/null +@exec cd /usr/include && %D/bin/h2ph -d %D/%%SITE_PERL%%/%%PERL_ARCH%% *.h machine/*.h sys/*.h >/dev/null %%GDBM%%@dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/GDBM_File @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/threads @dirrm lib/perl5/%%PERL_VER%%/%%PERL_ARCH%%/auto/threads/shared @@ -3277,13 +3277,15 @@ man/man1/zipdetails.1.gz @exec /usr/bin/makewhatis %D/lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%%/man @dirrmtry lib/perl5/%%PERL_VER%% +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/sys @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/sys +@exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/machine @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/machine @exec install -d %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%% -@dirrmtry %%SITE_PERL%%/auto @exec install -d %D/%%SITE_PERL%%/auto +@dirrmtry %%SITE_PERL%%/auto @dirrmtry %%SITE_PERL%% @dirrmtry lib/perl5/site_perl @dirrmtry lib/perl5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403312226.s2VMQ909019311>