From owner-freebsd-ports Fri Dec 22 13:40:24 2000 From owner-freebsd-ports@FreeBSD.ORG Fri Dec 22 13:40:13 2000 Return-Path: Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A5BAE37B699 for ; Fri, 22 Dec 2000 13:40:02 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id eBMLe2G45113; Fri, 22 Dec 2000 13:40:02 -0800 (PST) (envelope-from gnats) Resent-Date: Fri, 22 Dec 2000 13:40:02 -0800 (PST) Resent-Message-Id: <200012222140.eBMLe2G45113@freefall.freebsd.org> Resent-From: gnats-admin@FreeBSD.org (GNATS Management) Resent-To: freebsd-ports@FreeBSD.org Resent-Reply-To: gnats-admin@FreeBSD.org, mb@imp.ch Received: from fuchur.lan.attic.ch (fuchur.lan.attic.ch [194.235.47.21]) by hub.freebsd.org (Postfix) with ESMTP id 1489537B400 for ; Fri, 22 Dec 2000 13:33:33 -0800 (PST) Received: (from mblapp@localhost) by fuchur.lan.attic.ch (8.11.1/8.11.1) id eBMLZGJ75716; Fri, 22 Dec 2000 22:35:16 +0100 (CET) (envelope-from mblapp) Message-Id: <200012222135.eBMLZGJ75716@fuchur.lan.attic.ch> Date: Fri, 22 Dec 2000 22:35:16 +0100 (CET) From: mb@imp.ch Sender: mblapp@fuchur.lan.attic.ch Reply-To: mb@imp.ch To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/23775: [PATCH] Fix for fr-staroffice-5.2 Resent-Sender: gnats@FreeBSD.org Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 23775 >Category: ports >Synopsis: Fix $PATH for Staroffice5.2 user-installation (fr-staroffice-5.2) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Dec 22 13:40:02 PST 2000 >Closed-Date: >Last-Modified: >Originator: Martin Blapp >Release: FreeBSD 4.2-STABLE i386 >Organization: Improware AG >Environment: FreeBSD fuchur.lan.attic.ch 4.2-STABLE FreeBSD 4.2-STABLE #5: Sun Dec 10 11:00:08 CET 2000 root@fuchur.lan.attic.ch:/usr/src/sys/compile/FURCHUR i386 FreeBSD ports-tree for STABLE and CURRENT >Description: Wrong $PATH settings during user installation, invoked by make install-user >How-To-Repeat: During user installation, each time you get /usr/local/office52 as install path, but this is not a good idea because you'd like a $PATH like $HOME/office52. If you have to fix this each time you install it for a user it's just annoying. >Fix: -------------------------------------------------------------------------------- possible Commit message: ------------------------ Fix default $PATH settings for user-installation -------------------------------------------------------------------------------- location of port: ----------------- ports/french/staroffice52 -------------------------------------------------------------------------------- [PATCH] normal -------------- --- Makefile.orig Fri Dec 22 22:15:53 2000 +++ Makefile Fri Dec 22 22:16:47 2000 @@ -32,6 +32,7 @@ WRKSRC= ${WRKDIR}/office52 TMPDIR= ${WRKDIR}/tmp LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/linux/lib:${LINUXBASE}/usr/lib +INSTDB.INS= ${PREFIX}/office52/program/instdb.ins .include @@ -120,6 +121,9 @@ post-install: @${PATCH} -s ${PREFIX}/office52/program/setup ${FILESDIR}/setup.patch @${PATCH} -s ${PREFIX}/office52/program/soffice ${FILESDIR}/soffice.patch + @${CP} ${INSTDB.INS} ${INSTDB.INS}.orig + @${SED} -e 's%DefaultDestPath = "/usr/local/office52%DefaultDestPath = "office52%' \ + < ${INSTDB.INS}.orig > ${INSTDB.INS} install-user: ${PREFIX}/office52/program/setup -------------------------------------------------------------------------------- [PATCH] uuencoded ----------------- begin 644 Makefile.diff.uu M+2TM($UA:V5F:6QE+F]R:6<)1G)I($1E8R`R,B`R,CHQ-3HU,R`R,#`P"BLK M*R!-86ME9FEL90E&TQ)3E580D%317TO;&EN=7@O;&EB.B1[3$E.55A"05-%?2]UU!2149)6'TO;V9F:6-E-3(O<')O9W)A;2]I;G-T M9&(N:6YS"B`*("YI;F-L=61E(#QBU!!5$-(?2`MU!2149)6'TO;V9F:6-E-3(O<')O9W)A;2]S971U<"`D>T9)3$531$E2?2]S M971U<"YP871C:`H@"4`D>U!!5$-(?2`MU!2149)6'TO;V9F:6-E-3(O M<')O9W)A;2]S;V9F:6-E("1[1DE,15-$25)]+W-O9F9I8V4N<&%T8V@**PE` M)'M#4'T@)'M)3E-41$(N24Y3?2`D>TE.4U1$0BY)3E-]+F]R:6<**PE`)'M3 M141]("UE("=S)41E9F%U;'1$97-T4&%T:"`]("(O=7-R+VQO8V%L+V]F9FEC M934R)41E9F%U;'1$97-T4&%T:"`](")O9F9I8V4U,B4G(%P**PD@("`@/"`D M>TE.4U1$0BY)3E-]+F]R:6<@/B`D>TE.4U1$0BY)3E-]"B`*(&ENU!2149)6'TO;V9F:6-E-3(O<')O9W)A;2]S971U<`IA ` end -------------------------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message