From: Seemant Kulleen Date: Sun, 13 Oct 2002 11:57:04 +0000 (+0000) Subject: fixes with makemaker X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5241f93b038d2f8cbaadc35dfdb87f26f60bdc52;p=gentoo.git fixes with makemaker --- diff --git a/sys-devel/perl/ChangeLog b/sys-devel/perl/ChangeLog index 351a7676c0ac..b427e376c6bc 100644 --- a/sys-devel/perl/ChangeLog +++ b/sys-devel/perl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-devel/perl # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.13 2002/10/02 12:07:57 mcummings Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/ChangeLog,v 1.14 2002/10/13 11:57:04 seemant Exp $ + +*perl-5.6.1-r8 (13 Oct 2002) + + 13 Oct 2002; Seemant Kulleen perl-5.6.1-r8.ebuild + files/digest-perl-5.6.1-r8 : + + The fixes from -r7 didn't seem to make it into portage. So this version + has those, plus the updated MakeMaker. should close bug #8998 by + rac@intrigue.com (Robert Coie) *perl-5.6.1-r7 (02 Oct 2002) diff --git a/sys-devel/perl/files/digest-perl-5.6.1-r3 b/sys-devel/perl/files/digest-perl-5.6.1-r3 deleted file mode 100644 index a1b30f92f979..000000000000 --- a/sys-devel/perl/files/digest-perl-5.6.1-r3 +++ /dev/null @@ -1 +0,0 @@ -MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695 diff --git a/sys-devel/perl/files/digest-perl-5.6.1-r4 b/sys-devel/perl/files/digest-perl-5.6.1-r4 deleted file mode 100644 index a1b30f92f979..000000000000 --- a/sys-devel/perl/files/digest-perl-5.6.1-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695 diff --git a/sys-devel/perl/files/digest-perl-5.6.1-r5 b/sys-devel/perl/files/digest-perl-5.6.1-r5 deleted file mode 100644 index a1b30f92f979..000000000000 --- a/sys-devel/perl/files/digest-perl-5.6.1-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695 diff --git a/sys-devel/perl/files/digest-perl-5.6.1-r8 b/sys-devel/perl/files/digest-perl-5.6.1-r8 new file mode 100644 index 000000000000..d47fed0f0eeb --- /dev/null +++ b/sys-devel/perl/files/digest-perl-5.6.1-r8 @@ -0,0 +1,2 @@ +MD5 ec1ff15464809b562aecfaa2e65edba6 perl-5.6.1.tar.gz 5983695 +MD5 559896f9f222a750812c58b937a660f3 ExtUtils-MakeMaker-6.05.tar.gz 187528 diff --git a/sys-devel/perl/perl-5.6.1-r3.ebuild b/sys-devel/perl/perl-5.6.1-r3.ebuild deleted file mode 100644 index 3e6715c943b8..000000000000 --- a/sys-devel/perl/perl-5.6.1-r3.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.6.1-r3.ebuild,v 1.10 2002/10/05 05:39:26 drobbins Exp $ - -IUSE="berkdb gdbm" - -S=${WORKDIR}/${P} -DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" -SRC_URI="ftp://ftp.perl.org/pub/perl/CPAN/src/${P}.tar.gz" -HOMEPAGE="http://www.perl.org" -LICENSE="Artistic GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc sparc64" - -DEPEND="virtual/glibc sys-apps/groff berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) gdbm? ( >=sys-libs/gdbm-1.8.0 )" - -RDEPEND="virtual/glibc berkdb? ( >=sys-libs/db-3.2.3h-r3 =sys-libs/db-1.85-r1 ) gdbm? ( >=sys-libs/gdbm-1.8.0 )" - -src_compile() { - - local myconf - if [ "`use gdbm`" ] - then - myconf="-Di_gdbm" - fi - if [ "`use berkdb`" ] - then - myconf="${myconf} -Di_db -Di_ndbm" - else - myconf="${myconf} -Ui_db -Ui_ndbm" - fi - - # configure for libperl.so - sh Configure -des \ - -Darchname=${CHOST%%-*}-linux \ - -Dcccdlflags='-fPIC' \ - -Dccdlflags='-rdynamic' \ - -Dprefix=/usr \ - -Doptimize="${CFLAGS}" \ - -Duselargefiles \ - -Duseshrplib \ - -Dlibperl=libperl.so \ - -Dd_dosuid \ - -Dd_semctl_semun \ - ${myconf} || die - # add optimization flags - cp config.sh config.sh.orig - sed -e "s/optimize='-O2'/optimize=\'${CFLAGS}\'/" config.sh.orig > config.sh - # create libperl.so and move it out of the way - mv -f Makefile Makefile_orig - sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \ - Makefile_orig > Makefile - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - make libperl.so || die - mv libperl.so ${WORKDIR} - - # starting from scratch again - cd ${WORKDIR} - rm -rf ${S} - unpack ${A} - cd ${S} - - # configure for libperl.a -# this is gross -- from Christian Gafton, Red Hat - cat > config.over < config.sh - #THIS IS USED LATER: - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - -# Umm, for some reason this doesn't want to work, so we'll just remove -# the makefiles and let make rebuild them itself. (It seems to do it -# right the second time... -- pete -# cp makefile makefile.orig -# sed -e "s:^0::" makefile.orig > makefile - - #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile" - #(rather than the default "makefile") in all make commands below. - rm -f makefile x2p/makefile - make -f Makefile || die - # Parallel make fails - # dont use the || die since some tests fail on bootstrap - make -f Makefile test -} - -src_install() { - - insinto /usr/lib/perl5/${PV}/i686-linux/CORE/ - doins ${WORKDIR}/libperl.so - dosym /usr/lib/perl5/${PV}/i686-linux/CORE/libperl.so /usr/lib/libperl.so - - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - - make -f Makefile INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die - install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm - -make all -f - < config.sh - # create libperl.so and move it out of the way - mv -f Makefile Makefile_orig - sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \ - -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ - Makefile_orig > Makefile - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - make -f Makefile depend || die - mv makefile makefile_orig - mv x2p/makefile x2p/makefile_orig - egrep -v "(|)" makefile_orig >makefile - egrep -v "(|)" x2p/makefile_orig >x2p/makefile - make -f Makefile libperl.so || die - mv libperl.so ${WORKDIR} - - # starting from scratch again - cd ${WORKDIR} - rm -rf ${S} - unpack ${A} - cd ${S} - - # configure for libperl.a -# this is gross -- from Christian Gafton, Red Hat - cat > config.over < config.sh - #THIS IS USED LATER: - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - -# Umm, for some reason this doesn't want to work, so we'll just remove -# the makefiles and let make rebuild them itself. (It seems to do it -# right the second time... -- pete -# cp makefile makefile.orig -# sed -e "s:^0::" makefile.orig > makefile - - mv Makefile Makefile_orig - sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ - Makefile_orig > Makefile - - #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile" - #(rather than the default "makefile") in all make commands below. - rm -f makefile x2p/makefile - make -f Makefile depend || die - mv makefile makefile_orig - mv x2p/makefile x2p/makefile_orig - egrep -v "(|)" makefile_orig >makefile - egrep -v "(|)" x2p/makefile_orig >x2p/makefile - make -f Makefile || die - # Parallel make fails - # dont use the || die since some tests fail on bootstrap - if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then - echo "Skipping tests on this platform" - else - make -f Makefile test - fi -} - -src_install() { - - insinto /usr/lib/perl5/${PV}/i686-linux/CORE/ - doins ${WORKDIR}/libperl.so - dosym /usr/lib/perl5/${PV}/i686-linux/CORE/libperl.so /usr/lib/libperl.so - - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - - make -f Makefile INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die - install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm - -make all -f - < config.sh - # create libperl.so and move it out of the way - mv -f Makefile Makefile_orig - sed -e 's#^CCDLFLAGS = -rdynamic -Wl,-rpath,/usr/lib/perl5/.*#CCDLFLAGS = -rdynamic#' \ - -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ - Makefile_orig > Makefile - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - make -f Makefile depend || die - mv makefile makefile_orig - mv x2p/makefile x2p/makefile_orig - egrep -v "(|)" makefile_orig >makefile - egrep -v "(|)" x2p/makefile_orig >x2p/makefile - make -f Makefile libperl.so || die - mv libperl.so ${WORKDIR} - - # starting from scratch again - cd ${WORKDIR} - rm -rf ${S} - unpack ${A} - cd ${S} - - # configure for libperl.a -# this is gross -- from Christian Gafton, Red Hat - cat > config.over < config.sh - #THIS IS USED LATER: - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - -# Umm, for some reason this doesn't want to work, so we'll just remove -# the makefiles and let make rebuild them itself. (It seems to do it -# right the second time... -- pete -# cp makefile makefile.orig -# sed -e "s:^0::" makefile.orig > makefile - - mv Makefile Makefile_orig - sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ - Makefile_orig > Makefile - - #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile" - #(rather than the default "makefile") in all make commands below. - rm -f makefile x2p/makefile - make -f Makefile depend || die - mv makefile makefile_orig - mv x2p/makefile x2p/makefile_orig - egrep -v "(|)" makefile_orig >makefile - egrep -v "(|)" x2p/makefile_orig >x2p/makefile - make -f Makefile || die - # Parallel make fails - # dont use the || die since some tests fail on bootstrap - if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then - echo "Skipping tests on this platform" - else - make -f Makefile test - fi -} - -src_install() { - - insinto /usr/lib/perl5/${PV}/i686-linux/CORE/ - doins ${WORKDIR}/libperl.so - dosym /usr/lib/perl5/${PV}/i686-linux/CORE/libperl.so /usr/lib/libperl.so - - export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` - - make -f Makefile INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die - install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm - -make all -f - <|)" makefile_orig >makefile - egrep -v "(|)" x2p/makefile_orig >x2p/makefile + egrep -v "(|)" makefile_orig >makefile + egrep -v "(|)" x2p/makefile_orig >x2p/makefile make -f Makefile libperl.so || die mv libperl.so ${WORKDIR} @@ -143,27 +146,39 @@ src_install() { dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so -# make -f Makefile INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die - make DESTDIR=${D} INSTALLMAN1DIR=${D}/usr/share/man/man1 INSTALLMAN3DIR=${D}/usr/share/man/man3 install || die "Unable to make install" +# make -f Makefile \ +# INSTALLMAN1DIR=${D}/usr/share/man/man1 \ +# INSTALLMAN3DIR=${D}/usr/share/man/man3 \ +# install || die + + make \ + DESTDIR=${D} \ + INSTALLMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLMAN3DIR=${D}/usr/share/man/man3 \ + install || die "Unable to make install" install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm -#man pages + #man pages -# ./perl installman --man1dir=${D}/usr/share/man/man1 --man1ext=1 --man3dir=${D}/usr/share/man/man3 --man3ext=3 +# ./perl installman \ +# --man1dir=${D}/usr/share/man/man1 \ +# --man1ext=1 \ +# --man3dir=${D}/usr/share/man/man3 \ +# --man3ext=3 -# This removes ${D} from Config.pm + # This removes ${D} from Config.pm - dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm - dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist + dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm + dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist -# DOCUMENTATION + # DOCUMENTATION dodoc Changes* Artistic Copying README Todo* AUTHORS prepalldocs -# HTML Documentation + # HTML Documentation dodir /usr/share/doc/${PF}/html ./perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html diff --git a/sys-devel/perl/perl-5.6.1-r8.ebuild b/sys-devel/perl/perl-5.6.1-r8.ebuild new file mode 100644 index 000000000000..326db51c36f7 --- /dev/null +++ b/sys-devel/perl/perl-5.6.1-r8.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/sys-devel/perl/perl-5.6.1-r8.ebuild,v 1.1 2002/10/13 11:57:04 seemant Exp $ + +MMPV=6.05 +MMPN=ExtUtils-MakeMaker +MMP=${MMPN}-${MMPV} +S=${WORKDIR}/${P} +S2=${WORKDIR}/${MMP} +DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language" +SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${P}.tar.gz + http://cpan.valueclick.com/modules/by-module/ExtUtils/${MMP}.tar.gz" +HOMEPAGE="http://www.perl.org" + +SLOT="0" +LICENSE="Artistic GPL-2" +KEYWORDS="x86 ppc sparc sparc64 alpha" + + +RDEPEND="berkdb? ( >=sys-libs/db-3.2.3h-r3 + =sys-libs/db-1.85-r1 ) + gdbm? ( >=sys-libs/gdbm-1.8.0 )" + +DEPEND="sys-apps/groff + ${RDEPEND}" + +src_compile() { + local myconf + + use gdbm && myconf="-Di_gdbm" + + use berkdb \ + && myconf="${myconf} -Di_db -Di_ndbm" \ + || myconf="${myconf} -Ui_db -Ui_ndbm" + + # configure for libperl.so + sh Configure -des \ + -Darchname=${CHOST%%-*}-linux \ + -Dcccdlflags='-fPIC' \ + -Dccdlflags='-rdynamic' \ + -Dprefix=/usr \ + -Dlocincpth=' ' \ + -Doptimize="${CFLAGS}" \ + -Duselargefiles \ + -Duseshrplib \ + -Dlibperl=libperl.so \ + -Dd_dosuid \ + -Dd_semctl_semun \ + ${myconf} || die + # add optimization flags + cp config.sh config.sh.orig + sed -e "s/optimize='-O2'/optimize=\'${CFLAGS}\'/" config.sh.orig > config.sh + # create libperl.so and move it out of the way + mv -f Makefile Makefile_orig + sed -e 's#^C\(CDLFLAGS = -rdynamic\) -Wl,-rpath,/usr/lib/perl5/.*#\1#' \ + -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ + Makefile_orig > Makefile + export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` + # fixes a bug in the make/testing on new systems + make -f Makefile depend || die + mv makefile makefile_orig + mv x2p/makefile x2p/makefile_orig + egrep -v "(|)" makefile_orig >makefile + egrep -v "(|)" x2p/makefile_orig >x2p/makefile + make -f Makefile libperl.so || die + mv libperl.so ${WORKDIR} + + # starting from scratch again + cd ${WORKDIR} + rm -rf ${S} + unpack ${P}.tar.gz + cd ${S} + + # configure for libperl.a + # this is gross -- from Christian Gafton, Red Hat + cat > config.over < config.sh + #THIS IS USED LATER: + export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` + +# Umm, for some reason this doesn't want to work, so we'll just remove +# the makefiles and let make rebuild them itself. (It seems to do it +# right the second time... -- pete +# cp makefile makefile.orig +# sed -e "s:^0::" makefile.orig > makefile + + mv Makefile Makefile_orig + sed -e 's#^all: $(FIRSTMAKEFILE) #all: README #' \ + Makefile_orig > Makefile + + #for some reason, this rm -f doesn't seem to actually do anything. So we explicitly use "Makefile" + #(rather than the default "makefile") in all make commands below. + rm -f makefile x2p/makefile + make -f Makefile depend || die + mv makefile makefile_orig + mv x2p/makefile x2p/makefile_orig + egrep -v "(|)" makefile_orig >makefile + egrep -v "(|)" x2p/makefile_orig >x2p/makefile + make -f Makefile || die + cp ${O}/files/stat.t ./t/op/ + # Parallel make fails + # dont use the || die since some tests fail on bootstrap + if [ `expr "$PARCH" ":" "sparc"` -gt 4 ]; then + echo "Skipping tests on this platform" + else + make -f Makefile test + fi + +} + +src_install() { + + export PARCH=`grep myarchname config.sh | cut -f2 -d"'"` + + insinto /usr/lib/perl5/${PV}/${PARCH}/CORE/ + doins ${WORKDIR}/libperl.so + dosym /usr/lib/perl5/${PV}/${PARCH}/CORE/libperl.so /usr/lib/libperl.so + + +# make -f Makefile \ +# INSTALLMAN1DIR=${D}/usr/share/man/man1 \ +# INSTALLMAN3DIR=${D}/usr/share/man/man3 \ +# install || die + + make \ + DESTDIR=${D} \ + INSTALLMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLMAN3DIR=${D}/usr/share/man/man3 \ + install || die "Unable to make install" + + install -m 755 utils/pl2pm ${D}/usr/bin/pl2pm + + + #man pages + +# ./perl installman \ +# --man1dir=${D}/usr/share/man/man1 \ +# --man1ext=1 \ +# --man3dir=${D}/usr/share/man/man3 \ +# --man3ext=3 + + + # This removes ${D} from Config.pm + dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/Config.pm + dosed /usr/lib/perl5/${PV}/${CHOST%%-*}-linux/.packlist + + # DOCUMENTATION + dodoc Changes* Artistic Copying README Todo* AUTHORS + prepalldocs + + # HTML Documentation + dodir /usr/share/doc/${PF}/html + ./perl installhtml --recurse --htmldir=${D}/usr/share/doc/${PF}/html + + # MakeMaker Fix + cd ${S2} + ${D}/usr/bin/perl Makefile.PL ${myconf} PREFIX=${D}/usr + make \ + PREFIX=${D}/usr \ + INSTALLMAN1DIR=${D}/usr/share/man/man1 \ + INSTALLMAN2DIR=${D}/usr/share/man/man2 \ + INSTALLMAN3DIR=${D}/usr/share/man/man3 \ + INSTALLMAN4DIR=${D}/usr/share/man/man4 \ + INSTALLMAN5DIR=${D}/usr/share/man/man5 \ + INSTALLMAN6DIR=${D}/usr/share/man/man6 \ + INSTALLMAN7DIR=${D}/usr/share/man/man7 \ + INSTALLMAN8DIR=${D}/usr/share/man/man8 \ + install || die +}