Date: Wed, 14 Apr 2010 16:39:57 +0900 (JST) From: Maho NAKATA <chat95@mac.com> To: avg@icyb.net.ua Cc: ports@FreeBSD.org, srandall52@gmail.com, openoffice@FreeBSD.org Subject: Re: openoffice.org-3.2.0-spadmin Message-ID: <20100414.163957.625859878544535218.chat95@mac.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
----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 <avg@icyb.net.ua>
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 <avg@icyb.net.ua>
>> 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 <avg@icyb.net.ua> 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)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100414.163957.625859878544535218.chat95>