Page MenuHomeFreeBSD
Files F132039745

D3704.id8861.diff
No OneTemporary
Actions

D3704.id8861.diff
View Options

Index: lang/perl5-devel/Makefile
===================================================================
--- lang/perl5-devel/Makefile
+++ lang/perl5-devel/Makefile
@@ -162,9 +162,12 @@
ARCH_LIB=${_ARCH_LIB}
PLIST_SUB+= PORTVERSION=${PORTVERSION} # XXX Remove
+_PERL5_DEFAULT_FILE= ${WRKDIR}/PERL5_DEFAULT
+
# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
# bsd.port.options.mk is needed before including it.
.include <bsd.port.options.mk>
+.sinclude "${_PERL5_DEFAULT_FILE}"
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
@@ -235,9 +238,21 @@
.endif
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
+# Also, save PERL5_DEFAULT in case someone is not using the default Perl
+# version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading,
+# portmaster/portupgrade will remove the installed Perl version, and it will
+# remove any way to guess what the default Perl version is needed.
post-extract:
${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so
${LN} -s libperl.so.${PORTVERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+.if !defined(PACKAGE_BUILDING)
+ @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
+.endif
+
+.if !defined(PACKAGE_BUILDING)
+post-clean:
+ @${RM} ${_PERL5_DEFAULT_FILE}
+.endif
.if !defined(MAKING_PATCHES)
# make clean patch makepatch MAKING_PATCHES=
Index: lang/perl5.16/Makefile
===================================================================
--- lang/perl5.16/Makefile
+++ lang/perl5.16/Makefile
@@ -95,7 +95,10 @@
PKGDEINSTALL= ${WRKDIR}/use.perl
INSTALL_TARGET= install-strip
+_PERL5_DEFAULT_FILE= ${WRKDIR}/PERL5_DEFAULT
+
.include <bsd.port.pre.mk>
+.sinclude "${_PERL5_DEFAULT_FILE}"
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
@@ -230,9 +233,21 @@
SUB_LIST+= LINK_USRBIN=${LINK_USRBIN}
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
+# Also, save PERL5_DEFAULT in case someone is not using the default Perl
+# version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading,
+# portmaster/portupgrade will remove the installed Perl version, and it will
+# remove any way to guess what the default Perl version is needed.
post-extract:
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+.if !defined(PACKAGE_BUILDING)
+ @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
+.endif
+
+.if !defined(PACKAGE_BUILDING)
+post-clean:
+ @${RM} ${_PERL5_DEFAULT_FILE}
+.endif
post-patch:
${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
Index: lang/perl5.18/Makefile
===================================================================
--- lang/perl5.18/Makefile
+++ lang/perl5.18/Makefile
@@ -117,9 +117,12 @@
PKGDEINSTALL= ${WRKDIR}/use.perl
INSTALL_TARGET= install-strip
+_PERL5_DEFAULT_FILE= ${WRKDIR}/PERL5_DEFAULT
+
# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
# bsd.port.options.mk is needed before including it.
.include <bsd.port.options.mk>
+.sinclude "${_PERL5_DEFAULT_FILE}"
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
@@ -199,9 +202,21 @@
ARCH_LIB=${_ARCH_LIB}
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
+# Also, save PERL5_DEFAULT in case someone is not using the default Perl
+# version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading,
+# portmaster/portupgrade will remove the installed Perl version, and it will
+# remove any way to guess what the default Perl version is needed.
post-extract:
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+.if !defined(PACKAGE_BUILDING)
+ @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
+.endif
+
+.if !defined(PACKAGE_BUILDING)
+post-clean:
+ @${RM} ${_PERL5_DEFAULT_FILE}
+.endif
.if !defined(MAKING_PATCHES)
# make clean patch makepatch MAKING_PATCHES=
Index: lang/perl5.20/Makefile
===================================================================
--- lang/perl5.20/Makefile
+++ lang/perl5.20/Makefile
@@ -145,9 +145,12 @@
PRIV_LIB=${_PRIV_LIB} \
ARCH_LIB=${_ARCH_LIB}
+_PERL5_DEFAULT_FILE= ${WRKDIR}/PERL5_DEFAULT
+
# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
# bsd.port.options.mk is needed before including it.
.include <bsd.port.options.mk>
+.sinclude "${_PERL5_DEFAULT_FILE}"
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
@@ -194,9 +197,21 @@
.endif
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
+# Also, save PERL5_DEFAULT in case someone is not using the default Perl
+# version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading,
+# portmaster/portupgrade will remove the installed Perl version, and it will
+# remove any way to guess what the default Perl version is needed.
post-extract:
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+.if !defined(PACKAGE_BUILDING)
+ @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
+.endif
+
+.if !defined(PACKAGE_BUILDING)
+post-clean:
+ @${RM} ${_PERL5_DEFAULT_FILE}
+.endif
.if !defined(MAKING_PATCHES)
# make clean patch makepatch MAKING_PATCHES=
Index: lang/perl5.22/Makefile
===================================================================
--- lang/perl5.22/Makefile
+++ lang/perl5.22/Makefile
@@ -143,9 +143,12 @@
PRIV_LIB=${_PRIV_LIB} \
ARCH_LIB=${_ARCH_LIB}
+_PERL5_DEFAULT_FILE= ${WRKDIR}/PERL5_DEFAULT
+
# bsd.default-versions.mk needs to know LOCALBASE for Perl, so
# bsd.port.options.mk is needed before including it.
.include <bsd.port.options.mk>
+.sinclude "${_PERL5_DEFAULT_FILE}"
.include "${.CURDIR}/../../Mk/bsd.default-versions.mk"
# if this port is default due PERL5_DEFAULT
@@ -192,9 +195,21 @@
.endif
# Put a symlink to the future libperl.so.x.yy so that -lperl works.
+# Also, save PERL5_DEFAULT in case someone is not using the default Perl
+# version whilst not having set DEFAULT_VERSIONS=perl5=blah. While upgrading,
+# portmaster/portupgrade will remove the installed Perl version, and it will
+# remove any way to guess what the default Perl version is needed.
post-extract:
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so
${LN} -s libperl.so.${PERL_VERSION} ${WRKSRC}/libperl.so.${PERL_VER}
+.if !defined(PACKAGE_BUILDING)
+ @${ECHO_CMD} "PERL5_DEFAULT=${PERL5_DEFAULT}" > ${_PERL5_DEFAULT_FILE}
+.endif
+
+.if !defined(PACKAGE_BUILDING)
+post-clean:
+ @${RM} ${_PERL5_DEFAULT_FILE}
+.endif
.if !defined(MAKING_PATCHES)
# make clean patch makepatch MAKING_PATCHES=

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 14, 4:08 AM (3 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23706271
Default Alt Text
D3704.id8861.diff (6 KB)

Event Timeline