diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2009-10-13 01:25:49 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2009-10-13 01:25:49 +0000 |
| commit | 77552ebe0cb60d8aad0c5be207ca0f57890f7d3f (patch) | |
| tree | 25d79ddf504a8b0a3ce47157ca319b93efaffacc /gnu/usr.bin/perl/ext | |
| parent | f9d17d0addb93259731a2cc55bf1170965cf33d1 (diff) | |
Merge in some local changes that got lost.
Diffstat (limited to 'gnu/usr.bin/perl/ext')
| -rw-r--r-- | gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm | 1 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL b/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL index 2a9aa7b3405..29d66a715b8 100644 --- a/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL +++ b/gnu/usr.bin/perl/ext/DynaLoader/Makefile.PL @@ -34,8 +34,8 @@ test-xs: sub MY::static { ' $(PERL_SRC)/$(OBJECT) : $(FIRST_MAKEFILE) $(OBJECT) - $(RM_RF) $(PERL_SRC)/$(OBJECT) - $(CP) $(OBJECT) $(PERL_SRC)/$(OBJECT) + #$(RM_RF) $(PERL_SRC)/$(OBJECT) + #$(CP) $(OBJECT) $(PERL_SRC)/$(OBJECT) static :: $(PERL_SRC)/$(OBJECT) '; diff --git a/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm b/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm index f142403ca9c..7de77eb4986 100644 --- a/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm +++ b/gnu/usr.bin/perl/ext/Encode/lib/Encode/Alias.pm @@ -152,6 +152,7 @@ sub init_aliases { define_alias( qr/^(?:US-?)ascii$/i => '"ascii"' ); define_alias( 'C' => 'ascii' ); define_alias( qr/\b(?:ISO[-_]?)?646(?:[-_]?US)?$/i => '"ascii"' ); + define_alias( '646' => 'ascii' ); # Allow variants of iso-8859-1 etc. define_alias( qr/\biso[-_]?(\d+)[-_](\d+)$/i => '"iso-$1-$2"' ); diff --git a/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL b/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL index a8adbf01218..a48c039fa88 100644 --- a/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL +++ b/gnu/usr.bin/perl/ext/NDBM_File/Makefile.PL @@ -1,7 +1,7 @@ use ExtUtils::MakeMaker; WriteMakefile( NAME => 'NDBM_File', - LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], + #LIBS => ["-L/usr/local/lib -lndbm", "-ldbm -lucb"], XSPROTOARG => '-noprototypes', # XXX remove later? VERSION_FROM => 'NDBM_File.pm', INC => ($^O eq "MacOS" ? "-i ::::db:include" : "") |