From owner-freebsd-current Sun May 19 12: 9: 4 2002 Delivered-To: freebsd-current@freebsd.org Received: from zibbi.icomtek.csir.co.za (zibbi.icomtek.csir.co.za [146.64.24.58]) by hub.freebsd.org (Postfix) with ESMTP id 6C74537B403; Sun, 19 May 2002 12:08:50 -0700 (PDT) Received: (from jhay@localhost) by zibbi.icomtek.csir.co.za (8.11.6/8.11.6) id g4JJ8Nv10069; Sun, 19 May 2002 21:08:23 +0200 (SAT) (envelope-from jhay) From: John Hay Message-Id: <200205191908.g4JJ8Nv10069@zibbi.icomtek.csir.co.za> Subject: perl build broken on current. Was: Re: Perl script rewrites - progress (2) In-Reply-To: <20020518172806.GA25059@eeyore.local.dohd.org> from Mark Huizer at "May 18, 2002 07:28:06 pm" To: freebsd@dohd.org (Mark Huizer) Date: Sun, 19 May 2002 21:08:23 +0200 (SAT) Cc: current@FreeBSD.ORG, tobez@FreeBSD.ORG, markm@FreeBSD.ORG X-Mailer: ELM [version 2.4ME+ PL54 (25)] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > I just upgraded my machine, removed perl as far as I could find it, and > tried to rebuild perl from the ports tree. > > So far, I had to change the Makefile first, since it used perl for the > post-patch target. That was easy: > > change the CP and the PERL -pi to a: > > ${SED} <${FILES}/use.perl >$WRKDIR/use.perl > > But so far it doesn't compile :-( > Anyone else seeing this? This fix the perl build for me on current. The last part of the patch is a litlle brute force. For some reason the temporary dependancy file end up with lines and in them, so I just removed them in one of the sed invocations. I wasn't really interested in where they come from. I wanted a working perl, and didn't care much about a nice port. :-) John -- John Hay -- John.Hay@icomtek.csir.co.za / jhay@FreeBSD.org Index: Makefile =================================================================== RCS file: /home/ncvs/ports/lang/perl5/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- Makefile 19 Dec 2001 17:05:04 -0000 1.40 +++ Makefile 19 May 2002 18:53:53 -0000 @@ -119,12 +119,11 @@ BSDPAN_WRKSRC= ${WRKDIR}/BSDPAN-${PORTVERSION} post-patch: - ${CP} ${FILESDIR}/use.perl ${WRKDIR} - ${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g;' \ - -e 's|%%PERL_VER%%|${PERL_VER}|g;' \ - -e 's|%%PERL_VERSION%%|${PERL_VERSION}|g;' \ - -e 's|%%PERL_ARCH%%|${PERL_ARCH}|g;' \ - ${WRKDIR}/use.perl + ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%PERL_VER%%|${PERL_VER}|g' \ + -e 's|%%PERL_VERSION%%|${PERL_VERSION}|g' \ + -e 's|%%PERL_ARCH%%|${PERL_ARCH}|g' \ + <${FILESDIR}/use.perl >${WRKDIR}/use.perl post-install: @strip ${PREFIX}/bin/perl ${PREFIX}/bin/suidperl Index: files/patch-ae =================================================================== RCS file: /home/ncvs/ports/lang/perl5/files/patch-ae,v retrieving revision 1.5 diff -u -r1.5 patch-ae --- files/patch-ae 22 Mar 2001 15:17:46 -0000 1.5 +++ files/patch-ae 19 May 2002 18:19:11 -0000 @@ -1,5 +1,5 @@ ---- makedepend.SH.ORIG Fri Jul 24 06:00:58 1998 -+++ makedepend.SH Thu Jul 30 17:08:37 1998 +--- makedepend.SH.orig Mon Mar 19 09:33:17 2001 ++++ makedepend.SH Sun May 19 20:19:01 2002 @@ -68,6 +68,7 @@ case "$osname" in os2) ;; @@ -8,3 +8,15 @@ *) $touch $firstmakefile ;; esac fi +@@ -196,8 +197,9 @@ + $echo "Updating $mf..." + $echo "# If this runs make out of memory, delete /usr/include lines." \ + >> $mf.new +- $sed 's|^\(.*\$(OBJ_EXT):\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" .deptmp \ +- >>$mf.new ++ $sed -e '/built-in/d' -e '/command line/d' \ ++ -e 's|^\(.*\$(OBJ_EXT):\) *\(.*/.*\.c\) *$|\1 \2; '"$defrule \2|" \ ++ .deptmp >>$mf.new + else + $MAKE hlist || ($echo "Searching for .h files..."; \ + $echo *.h | $tr ' ' $trnl | $egrep -v '\*' >.hlist) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message