diff options
author | ben <ben@pkgsrc.org> | 2006-10-08 17:48:30 +0000 |
---|---|---|
committer | ben <ben@pkgsrc.org> | 2006-10-08 17:48:30 +0000 |
commit | 1d59dab6fc9d4f23fcfa30e3884e5c38faa6af7f (patch) | |
tree | 6889b78c001227ce1cdee2f9d696ae6610a22c50 /lang/perl5 | |
parent | 293681ec2f5cf0b6e196a3f299aad9896600a728 (diff) | |
download | pkgsrc-1d59dab6fc9d4f23fcfa30e3884e5c38faa6af7f.tar.gz |
Remove extraneous interix change from patch-cb.
Perhaps this change was accepted upstream, and not yet removed from pkgsrc.
Diffstat (limited to 'lang/perl5')
-rw-r--r-- | lang/perl5/distinfo | 4 | ||||
-rw-r--r-- | lang/perl5/patches/patch-cb | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index b18750e17b8..9cd834ba02a 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.37 2006/08/08 15:36:00 tron Exp $ +$NetBSD: distinfo,v 1.38 2006/10/08 17:48:30 ben Exp $ SHA1 (perl-5.8.8.tar.bz2) = 4aab490040727ca4419098720eca2ba4367df539 RMD160 (perl-5.8.8.tar.bz2) = e78f26d9b96e6db35f946ad4ff55e3a69385c71b @@ -13,7 +13,7 @@ SHA1 (patch-aq) = b9569d0cd74a06912e82498cd2bfba131c0b6f3b SHA1 (patch-ar) = 9d257ceeca337e3d477b80215560bbc290d19dd2 SHA1 (patch-ba) = 27aefd5043c251380ac607df54fff882f689f237 SHA1 (patch-ca) = 5ed14e043a6d5f8dadf5711b59418f01aa5f6f21 -SHA1 (patch-cb) = 65e523885a404b79349a5c9601fe52965772d820 +SHA1 (patch-cb) = 2cbcaa476f33c270bfea50cddd0da3f476dbe689 SHA1 (patch-ce) = 6b1efab32c6bc28e0faf7522322e6d805eb21730 SHA1 (patch-ch) = a0831869e23d4a66588e6e27eecedb08527c9498 SHA1 (patch-ci) = fe943f07044efa457d163eb86974ea10bb356226 diff --git a/lang/perl5/patches/patch-cb b/lang/perl5/patches/patch-cb index 6f26f1be635..4262b12c170 100644 --- a/lang/perl5/patches/patch-cb +++ b/lang/perl5/patches/patch-cb @@ -1,21 +1,17 @@ -$NetBSD: patch-cb,v 1.3 2006/04/09 06:34:33 jlam Exp $ +$NetBSD: patch-cb,v 1.4 2006/10/08 17:48:30 ben Exp $ ---- Makefile.SH.orig 2006-01-24 07:49:44.000000000 -0500 +--- Makefile.SH.orig 2006-01-24 04:49:44.000000000 -0800 +++ Makefile.SH -@@ -73,7 +73,11 @@ true) +@@ -73,7 +73,7 @@ true) sunos*) linklibperl="-lperl" ;; - netbsd*|freebsd[234]*|openbsd*) -+ interix*) -+ linklibperl="-L. -lperl" -+ shrpldflags="$shrpldflags -Wl,--image-base,0x57000000" -+ ;; + netbsd*|freebsd[234]*|openbsd*|dragonfly*) linklibperl="-L. -lperl" ;; interix*) -@@ -85,7 +89,7 @@ true) +@@ -85,7 +85,7 @@ true) case "$osvers" in 3*) shrpldflags="$shrpldflags -e _nostart" ;; @@ -24,7 +20,7 @@ $NetBSD: patch-cb,v 1.3 2006/04/09 06:34:33 jlam Exp $ ;; esac shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib" -@@ -990,6 +994,10 @@ s_dummy $(static_ext): miniperl$(EXE_EXT +@@ -990,6 +990,10 @@ s_dummy $(static_ext): miniperl$(EXE_EXT n_dummy $(nonxs_ext): miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE @$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL) |