From owner-freebsd-openoffice@FreeBSD.ORG Wed Apr 14 07:40:04 2010 Return-Path: Delivered-To: openoffice@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 411EC106564A; Wed, 14 Apr 2010 07:40:04 +0000 (UTC) (envelope-from maho.nakata@gmail.com) Received: from mail-gy0-f182.google.com (mail-gy0-f182.google.com [209.85.160.182]) by mx1.freebsd.org (Postfix) with ESMTP id D097D8FC13; Wed, 14 Apr 2010 07:40:03 +0000 (UTC) Received: by gyh20 with SMTP id 20so4302995gyh.13 for ; Wed, 14 Apr 2010 00:40:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:date:message-id:to:cc :subject:from:in-reply-to:references:x-mailer:mime-version :content-type:content-transfer-encoding; bh=wMZ78U4hKk3mVAngr7DgZYUjGzI9uVee4DguhcgqkGg=; b=iVPLK2tNIiWu8pbzBBsH7hi92CA66a1EYr58JLDKqvIO33hD91avY8pCl+3qdfW4yY CyIuJSMGu4vf6b49KoGY51rbWyPQ6kxAhsCOf6nQvPSYA0wQpEPIMsIRa1EepIppgWao 18gwvhO3lToNnaQN7v6wKIXGJ269ChPpEAxgM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:message-id:to:cc:subject:from:in-reply-to:references :x-mailer:mime-version:content-type:content-transfer-encoding; b=aB8k1eargErlwkweT4iD7D+mkYCF71f+mFQZwZC8nlp3FZr/enczlsBl50UKI7xQr5 FGOQYjQjwn4bioE9QJvFviQBDFILLC/BeuUzw5cXcf9NxhbxGwtGow4cKrebaAjpq/gw TFVlR04CRZVlDekLR/4y/3BbDE4wv9s6xbL+A= Received: by 10.101.136.33 with SMTP id o33mr11157406ann.63.1271230802449; Wed, 14 Apr 2010 00:40:02 -0700 (PDT) Received: from localhost (rikad42.riken.jp [134.160.214.42]) by mx.google.com with ESMTPS id 9sm13432yxf.47.2010.04.14.00.39.59 (version=SSLv3 cipher=RC4-MD5); Wed, 14 Apr 2010 00:40:01 -0700 (PDT) Sender: Maho NAKATA Date: Wed, 14 Apr 2010 16:39:57 +0900 (JST) Message-Id: <20100414.163957.625859878544535218.chat95@mac.com> To: avg@icyb.net.ua From: Maho NAKATA In-Reply-To: <4BC56BEA.6020904@icyb.net.ua> References: <4BBDF7D1.6070709@icyb.net.ua> <20100414.074742.519459540419532564.chat95@mac.com> <4BC56BEA.6020904@icyb.net.ua> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="--Next_Part(Wed_Apr_14_16_39_57_2010_609)--" Content-Transfer-Encoding: 7bit Cc: ports@FreeBSD.org, srandall52@gmail.com, openoffice@FreeBSD.org Subject: Re: openoffice.org-3.2.0-spadmin X-BeenThere: freebsd-openoffice@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting OpenOffice to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Apr 2010 07:40:04 -0000 ----Next_Part(Wed_Apr_14_16_39_57_2010_609)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Hi Andriy I attached a new patch, just bumped portrevision. Please go ahead and commit. Please include "bump PORTREVISION", "approved by maho" in your commit log. Thanks From: Andriy Gapon Subject: Re: openoffice.org-3.2.0-spadmin Date: Wed, 14 Apr 2010 10:16:58 +0300 > on 14/04/2010 01:47 Maho NAKATA said the following: >> Andriy are you a committer? > > Different kind - an src one :-) > >> If you are, you can submit patch to me and I'll approve. >> thanks! > > The patch: > --- Makefile.orig 2010-04-14 10:13:44.064102203 +0300 > +++ Makefile 2010-04-14 10:15:11.615310335 +0300 > @@ -251,6 +251,7 @@ > @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ > -e 's#%%OOOTAG%%#${OOOTAG}#g' \ > -e 's#%%OOODIR%%#${OOODIR}#g' \ > + -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ > -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ > ${WRKDIR}/openoffice.org-wrapper > @${INSTALL_SCRIPT} ${WRKDIR}/openoffice.org-wrapper \ > > > P.S. sorry for not recognizing you, our openoffice.org maintainer, in the other > thread on stable@ :-) > >> From: Andriy Gapon >> Subject: Re: openoffice.org-3.2.0-spadmin >> Date: Thu, 08 Apr 2010 18:35:45 +0300 >> >>> on 08/04/2010 17:34 Steve Randall said the following: >>>> On Thu, 08 Apr 2010 14:54:09 +0300 >>>> Andriy Gapon wrote: >>>> >>>>> Not sure if this is an upstream issue or something in editors/openoffice.org-3: >>>>> openoffice.org-3.2.0-spadmin is a symlink to openoffice.org-3.2.0 and running it >>>>> produces a "new document" startup window. >>>>> I believe that it should be a symlink to >>>>> ${LOCALBASE}/openoffice.org-3.2.0/openoffice.org3/program/spadmin which is the >>>>> actual openoffice.org printer configuration program which, for example, allows to >>>>> select which of the printers is to be used as a default one. >>>> There's an omission in the port Makefile. The problem is that the >>>> wrapper script /usr/local/bin/openoffice.org-3.2.0 contains a >>>> %%OOOVERSION%% that does not get replaced (with "3.2.0") prior to >>>> installing the file. Just make that change manually and it will work. >>> Oh, I see what you say: >>> ... >>> oopath=/usr/local/openoffice.org-3.2.0/openoffice.org3 >>> program=`echo $0 | sed -e 's|.*-%%OOOVERSION%%-||'` >>> ... >>> >>> Probably replace command for openoffice.org-wrapper file in post-install target >>> needs to grow the following substitution: >>> -e 's#%%OOOVERSION%%#${OOOVERSION}#g' >>> >>> -- >>> Andriy Gapon >>> _______________________________________________ >>> freebsd-openoffice@freebsd.org mailing list >>> http://lists.freebsd.org/mailman/listinfo/freebsd-openoffice >>> To unsubscribe, send any mail to "freebsd-openoffice-unsubscribe@freebsd.org" >>> > > > -- > Andriy Gapon > ----Next_Part(Wed_Apr_14_16_39_57_2010_609)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename=patch Index: ports/editors/openoffice.org-3/Makefile =================================================================== RCS file: /home/pcvs/ports/editors/openoffice.org-3/Makefile,v retrieving revision 1.331 diff -u -r1.331 Makefile --- ports/editors/openoffice.org-3/Makefile 1 Apr 2010 00:48:45 -0000 1.331 +++ ports/editors/openoffice.org-3/Makefile 14 Apr 2010 07:38:39 -0000 @@ -7,7 +7,7 @@ PORTNAME?= openoffice.org PORTVERSION?= ${OOOVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES+= editors java MASTER_SITES+= http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \ http://ooopackages.good-day.net/pub/OpenOffice.org/misc/moz/:mozsrc \ @@ -250,6 +250,7 @@ @${CP} ${FILESDIR}/openoffice.org-wrapper ${WRKDIR}/ @${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%OOOTAG%%#${OOOTAG}#g' \ + -e 's#%%OOOVERSION%%#${OOOVERSION}#g' \ -e 's#%%OOODIR%%#${OOODIR}#g' \ -e 's#%%INSTALLATION_BASEDIR%%#${INSTALLATION_BASEDIR}#g' \ ${WRKDIR}/openoffice.org-wrapper ----Next_Part(Wed_Apr_14_16_39_57_2010_609)----