From owner-freebsd-ports Mon Aug 19 11:31:36 2002 Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B9DAA37B400; Mon, 19 Aug 2002 11:31:33 -0700 (PDT) Received: from salmon.maths.tcd.ie (salmon.maths.tcd.ie [134.226.81.11]) by mx1.FreeBSD.org (Postfix) with SMTP id 22D6243E3B; Mon, 19 Aug 2002 11:31:32 -0700 (PDT) (envelope-from bradyn@maths.tcd.ie) Received: from walton.maths.tcd.ie by salmon.maths.tcd.ie with SMTP id ; 19 Aug 2002 19:31:31 +0100 (BST) To: freebsd-gnats-submit@FreeBSD.org Cc: koma2@jiro.c.u-tokyo.ac.jp, freebsd-ports@FreeBSD.org Subject: Re: ports/41121: print acroread5: 2 sed_inplace problems X-It's: all good X-Wigglefluff: fuddtastic X-Zippy: Yow!! That's a GOOD IDEA!! Eating a whole FIELD of COUGH MEDICINE should make you feel MUCH BETTER!! That's a decision that can only be made between you & SY SPERLING!! Date: Mon, 19 Aug 2002 19:31:29 +0100 From: Niall Brady Message-ID: <200208191931.aa94274@salmon.maths.tcd.ie> Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org Just spotted this today. We're running 4.6-STABLE, with freshly cvsupped ports tree (i.e. r1.42 of print/acroread/Makefile). I'm not sure if I'm seeing a problem here (not knowing sed_inplace ;-), but as the "-i" argument to ${REINPLACE_ARGS} was removed between 1.41, and 1.42, the "make install" stage doesn't patch the installed file. The patch below seems to fix it for me, using either sed_inplace, or pure sed, on STABLE. However, if there's some newer version of sed_inplace out there, that doesn't require the "-i" argument, then REINPLACE_ARGS might want to be made part of a conditional which tests for ${OSVERSION}, similar to that used in bsd.port.mk for REINPLACE_CMD (as I'm buggered if I know how to make conditionals work with multi-word strings in BSD make ;-) [also minor nit fixed with an extraneous "-E" argument]. -- Niall --- Makefile.orig Mon Aug 19 19:00:44 2002 +++ Makefile Mon Aug 19 19:04:15 2002 @@ -21,7 +21,7 @@ USE_LINUX= yes USE_REINPLACE= yes -REINPLACE_ARGS= -E +REINPLACE_ARGS= -i '' -E NO_FILTER_SHLIBS= yes .if ${ARCH} == "i386" @@ -44,7 +44,7 @@ ${REINPLACE_CMD} 's:Linux):FreeBSD|Linux):g' ${PREFIX}/Acrobat5/bin/acroread -@/compat/linux/usr/bin/strip ${PREFIX}/Acrobat5/Reader/intellinux/bin/acroread @brandelf -t Linux ${PREFIX}/Acrobat5/Reader/intellinux/bin/acroread - ${REINPLACE_CMD} -E 's:OSF1):FreeBSD|OSF1):g' ${PREFIX}/Acrobat5/bin/acroread + ${REINPLACE_CMD} 's:OSF1):FreeBSD|OSF1):g' ${PREFIX}/Acrobat5/bin/acroread @cd ${PREFIX}/Acrobat5/bin && \ ${INSTALL_SCRIPT} ${PREFIX}/Acrobat5/bin/acroread \ ${PREFIX}/bin/acroread5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message