head	1.4;
access;
symbols
	RELEASE_8_3_0:1.3
	RELEASE_9_0_0:1.1
	RELEASE_7_4_0:1.1
	RELEASE_8_2_0:1.1
	RELEASE_6_EOL:1.1
	RELEASE_8_1_0:1.1
	RELEASE_7_3_0:1.1
	RELEASE_8_0_0:1.1;
locks; strict;
comment	@# @;


1.4
date	2013.02.04.12.03.36;	author svnexp;	state dead;
branches;
next	1.3;

1.3
date	2012.03.11.23.49.09;	author linimon;	state Exp;
branches;
next	1.2;

1.2
date	2012.03.08.18.37.53;	author pgollucci;	state dead;
branches;
next	1.1;

1.1
date	2009.06.08.14.35.28;	author skv;	state Exp;
branches;
next	;


desc
@@


1.4
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/311580
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# http://rt.perl.org/rt3/Public/Bug/Display.html?id=64562
# Adapted from:
# http://perl5.git.perl.org/perl.git/commitdiff/ee6d2783b2d78accfac54397826acf5f6e1715e1?hp=5a8cf367090fb5d83d8e8e0ae381a3525a215928
diff --git a/op.c b/op.c
index 517f648..89ed522 100644
--- op.c
+++ op.c
@@@@ -6166,9 +6166,13 @@@@ Perl_newFORM(pTHX_ I32 floor, OP *o, OP *block)
 	    const line_t oldline = CopLINE(PL_curcop);
 	    if (PL_copline != NOLINE)
 		CopLINE_set(PL_curcop, PL_copline);
-	    Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
-			o ? "Format %"SVf" redefined"
-			: "Format STDOUT redefined", (void*)cSVOPo->op_sv);
+	    if (o) {
+		Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
+			    "Format %"SVf" redefined", (void*)cSVOPo->op_sv);
+	    } else {
+		Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
+			    "Format STDOUT redefined");
+	    }
 	    CopLINE_set(PL_curcop, oldline);
 	}
 	SvREFCNT_dec(cv);
@


1.3
log
@Undo ports/165457 to not violate POLA.  As far as I knew, the PR
was to test what happened when we did eventually delete these two
ports, not to delete them immediately.

A subsequent commit will add appropriate deprecation messages.

Hat:		portmgr
PR:		ports/165457
Feature safe:	yes (actually no, however, this is to preserve POLA)
@
text
@@


1.2
log
@- Remove lang/perl5.8 (12/16/2008 EOL) and lang/perl5.10 (08/23/2009 EOL)
- lang/5.12 (default) is in Maint mode and lang/5.14 is GA right now.
- The final UNcommitted portition of this PR will move the default perl
  to lang/perl5.14 but
    mail/cyrus-impad2
    mail/cyrus-impad22
    print/perlftlib
    audio/papcl
    www/WebMagick
    misc/gcstar
    math/ploymak
  must be fixed or marked BROKEN 1st.

PR:             ports/165457
Submitted by:   pgollucci (myself)
Approved by:    portmgr (linimon)
Exp Run by:     linimon
Tested by:      make index
@
text
@@


1.1
log
@- Add more essential bugfixes
- Add perl-threaded-5.* to CONFLICTS [1]
- Introduce PERL_VENDOR_PREFIX variable
- Be really PREFIX-neutral [2}

Submitted by:	lth [1], rafan [2]
@
text
@@

