Bug 150932 - [UPDATE] www/midori to 0.2.8
Summary: [UPDATE] www/midori to 0.2.8
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Koop Mast
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-09-25 12:50 UTC by Olivier Duchateau
Modified: 2010-10-04 07:30 UTC (History)
0 users

See Also:


Attachments
file.diff (5.66 KB, patch)
2010-09-25 12:50 UTC, Olivier Duchateau
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Olivier Duchateau 2010-09-25 12:50:00 UTC

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-09-25 12:50:06 UTC
Responsible Changed
From-To: freebsd-ports-bugs->kwm

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 swell.k 2010-09-25 13:05:26 UTC
Olivier DUCHATEAU <duchateau.olivier@gmail.com> writes:

> @@ -33,7 +34,7 @@
>  HAS_CONFIGURE=	yes
>  USE_PYTHON_BUILD=	yes
>  USE_BZIP2=	yes
> -USE_GNOME=	glib20 gtk20 intltool libxml2 pkgconfig
> +USE_GNOME=	glib20 gtk20 intltool libxml2 desktopfileutils pkgconfig
>  USE_XORG=	xscrnsaver
>  INSTALLS_ICONS=	yes
>  USE_LDCONFIG=	yes

This is not needed if you're gonna ignore exit code later.

> @@ -74,6 +75,7 @@
>  .endif
>  
>  post-install:
> +	@-update-desktop-database

Note, update-desktop-database by default updates mimeinfo.cache in
LOCALBASE while the port installs into PREFIX.

>  .if defined(WITH_APIDOCS)
>  	${MKDIR} ${DOCSDIR}/api/katze/html
>  	${MKDIR} ${DOCSDIR}/api/midori/html

> @@ -158,7 +227,6 @@
>  %%APIDOCS%%@dirrm %%DOCSDIR%%/api
>  %%USERDOCS%%@dirrm %%DOCSDIR%%/user
>  @dirrm %%DOCSDIR%%
> -@dirrmtry share/applications
>  @dirrm lib/midori
>  @dirrm include/midori-0.2/extensions
>  @dirrm include/midori-0.2

Why? share/applications is neither in BSD.local.dist nor in
BSD.gnome.dist.
Comment 3 Olivier Duchateau 2010-09-25 14:09:16 UTC
2010/9/25 Anonymous <swell.k@gmail.com>:
> Olivier DUCHATEAU <duchateau.olivier@gmail.com> writes:
>
>> @@ -33,7 +34,7 @@
>> =A0HAS_CONFIGURE=3D =A0 =A0 =A0 yes
>> =A0USE_PYTHON_BUILD=3D =A0 =A0yes
>> =A0USE_BZIP2=3D =A0 yes
>> -USE_GNOME=3D =A0 glib20 gtk20 intltool libxml2 pkgconfig
>> +USE_GNOME=3D =A0 glib20 gtk20 intltool libxml2 desktopfileutils pkgconf=
ig
>> =A0USE_XORG=3D =A0 =A0xscrnsaver
>> =A0INSTALLS_ICONS=3D =A0 =A0 =A0yes
>> =A0USE_LDCONFIG=3D =A0 =A0 =A0 =A0yes
>
> This is not needed if you're gonna ignore exit code later.
>
>> @@ -74,6 +75,7 @@
>> =A0.endif
>>
>> =A0post-install:
>> + =A0 =A0 @-update-desktop-database
>
> Note, update-desktop-database by default updates mimeinfo.cache in
> LOCALBASE while the port installs into PREFIX.

I've already seen software doesn't appear in Xfce menu when this
target isn't enable. We must restart the session.
LOCALBASE is the variable when PREFIX is not defined.

>
>> =A0.if defined(WITH_APIDOCS)
>> =A0 =A0 =A0 ${MKDIR} ${DOCSDIR}/api/katze/html
>> =A0 =A0 =A0 ${MKDIR} ${DOCSDIR}/api/midori/html
>
>> @@ -158,7 +227,6 @@
>> =A0%%APIDOCS%%@dirrm %%DOCSDIR%%/api
>> =A0%%USERDOCS%%@dirrm %%DOCSDIR%%/user
>> =A0@dirrm %%DOCSDIR%%
>> -@dirrmtry share/applications
>> =A0@dirrm lib/midori
>> =A0@dirrm include/midori-0.2/extensions
>> =A0@dirrm include/midori-0.2
>
> Why? share/applications is neither in BSD.local.dist nor in
> BSD.gnome.dist.
>

Why BSD.gnome.dist ? I don't use GNOME. It's default behavior. KDE
users could say the same thing.


--=20
olivier
Comment 4 swell.k 2010-09-25 14:25:04 UTC
Olivier Duchateau <duchateau.olivier@gmail.com> writes:

>>>  post-install:
>>> +     @-update-desktop-database
>>
>> Note, update-desktop-database by default updates mimeinfo.cache in
>> LOCALBASE while the port installs into PREFIX.
>
> I've already seen software doesn't appear in Xfce menu when this
> target isn't enable. We must restart the session.
> LOCALBASE is the variable when PREFIX is not defined.

And when PREFIX is defined? It'll still update mimeinfo.cache in LOCALBASE.
What I have in mind is below

  @-update-desktop-database ${PREFIX}/share/applications

There is no point in updating mimeinfo.cache in LOCALBASE if the port
doesn't install .desktop files there. Try to change PREFIX and add `-v'
option to update-desktop-database to see.

>>> -@dirrmtry share/applications
>>
>> Why? share/applications is neither in BSD.local.dist nor in
>> BSD.gnome.dist.
>
> Why BSD.gnome.dist ? I don't use GNOME. It's default behavior. KDE
> users could say the same thing.

If it were in BSD.gnome.dist we could use gnomehier in USE_GNOME.
It's not MTREE_FILE clean and QAT will likely complain about the
directory not previously been there. Try smth like this

  $ export PREFIX=$HOME/aaa PKG_DBDIR=$HOME/pkg
  $ make install deinstall
  $ mtree -f $(make -V MTREE_FILE) -p $PREFIX
  share/applications extra

Now, I haven't tried above myself since I don't use midori.
Comment 5 dfilter service freebsd_committer freebsd_triage 2010-10-04 07:26:09 UTC
kwm         2010-10-04 06:26:04 UTC

  FreeBSD ports repository

  Modified files:
    www/midori           Makefile distinfo pkg-plist 
  Log:
  Update to 0.2.8
  
  Use XFCE master site macro, instead of 1 mirror.
  depend on desktopfileutils so it will show up in xfce without session restart
  
  PR:             ports/150932
  Submitted by:   Olivier DUCHATEAU <duchateau.olivier@gmail.com>
  
  Revision  Changes    Path
  1.20      +5 -3      ports/www/midori/Makefile
  1.12      +3 -3      ports/www/midori/distinfo
  1.11      +2 -1      ports/www/midori/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 6 Koop Mast freebsd_committer freebsd_triage 2010-10-04 07:26:31 UTC
State Changed
From-To: open->closed

Committed thanks! 

Only note I have is that you don't need to try to remove all those locale  
directories. All of those you added are already mentioned in  
ports/Templates/BSD.local.dist.