18.08.2013 21:30 пользователь "Antoine Jacoutot" <[email protected]>
написал:
>
> On Sun, Aug 18, 2013 at 09:19:17PM +0400, Vadim Zhukov wrote:
> > Here is the first bunch of fixes for handling of FreeDesktop goo.
> > Okay?
> > --
> > WBR,
> > Vadim Zhukov
> >
> >
> > Index: audio/deadbeef/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/deadbeef/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- audio/deadbeef/Makefile 31 May 2013 15:34:40 -0000 1.7
> > +++ audio/deadbeef/Makefile 18 Aug 2013 16:41:57 -0000
> > @@ -4,7 +4,7 @@ SHARED_ONLY = Yes
> >
> > COMMENT = DeaDBeeF is an audio player
> > DISTNAME = deadbeef-0.5.6
> > -REVISION = 2
> > +REVISION = 3
> > CATEGORIES = audio
> >
> > HOMEPAGE = http://deadbeef.sourceforge.net/
> > Index: audio/deadbeef/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/audio/deadbeef/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 PLIST
> > --- audio/deadbeef/pkg/PLIST 5 Feb 2013 09:19:31 -0000 1.4
> > +++ audio/deadbeef/pkg/PLIST 18 Aug 2013 16:41:57 -0000
> > @@ -123,5 +123,5 @@ share/locale/zh_CN/LC_MESSAGES/deadbeef.
> > share/locale/zh_TW/LC_MESSAGES/deadbeef.mo
> > @exec %D/bin/update-desktop-database
> > @unexec-delete %D/bin/update-desktop-database
> > -@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2>
/dev/null || true
> > -@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t
%D/share/icons/hicolor 2> /dev/null || true
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> > Index: audio/exaile/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/exaile/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -r1.27 Makefile
> > --- audio/exaile/Makefile 3 Apr 2013 06:49:47 -0000 1.27
> > +++ audio/exaile/Makefile 18 Aug 2013 16:46:01 -0000
> > @@ -5,7 +5,7 @@ COMMENT = music manager and player for G
> > V = 3.3
> > P = 1
> > DISTNAME = exaile-${V}.${P}
> > -REVISION = 0
> > +REVISION = 1
> >
> > CATEGORIES = audio x11
> >
> > Index: audio/exaile/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/audio/exaile/pkg/PLIST,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 PLIST
> > --- audio/exaile/pkg/PLIST 3 Apr 2013 06:49:47 -0000 1.11
> > +++ audio/exaile/pkg/PLIST 18 Aug 2013 16:46:01 -0000
> > @@ -1116,8 +1116,6 @@ share/exaile/data/ui/widgets/volume_cont
> > share/exaile/xdg/
> > share/exaile/xdg/exaile/
> > share/exaile/xdg/exaile/settings.ini
> > -@exec %D/bin/update-desktop-database
> > -@unexec-delete %D/bin/update-desktop-database
> > share/locale/ar/LC_MESSAGES/exaile.mo
> > share/locale/ast/LC_MESSAGES/exaile.mo
> > share/locale/be/LC_MESSAGES/exaile.mo
>
> Are you sure this is correct?
Yes, it is duplicated at the end of PLIST.
> > Index: audio/gtkpod/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/audio/gtkpod/Makefile,v
> > retrieving revision 1.45
> > diff -u -p -r1.45 Makefile
> > --- audio/gtkpod/Makefile 10 Mar 2013 22:55:02 -0000 1.45
> > +++ audio/gtkpod/Makefile 18 Aug 2013 16:50:15 -0000
> > @@ -2,7 +2,7 @@
> >
> > COMMENT= GTK+2 program to synchronize an Apple iPod
> > DISTNAME= gtkpod-1.0.0
> > -REVISION = 1
> > +REVISION = 2
> > CATEGORIES= audio x11
> > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
> >
> > @@ -24,7 +24,8 @@ USE_GMAKE= Yes
> >
> > #libmp4v2 is dlopen()'ed at runtime
> > RUN_DEPENDS= devel/desktop-file-utils \
> > - multimedia/libmp4v2
> > + multimedia/libmp4v2 \
> > + x11/gtk+2,-guic
> >
> > LIB_DEPENDS= audio/libid3tag \
> > audio/libgpod \
> > Index: audio/gtkpod/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/audio/gtkpod/pkg/PLIST,v
> > retrieving revision 1.11
> > diff -u -p -r1.11 PLIST
> > --- audio/gtkpod/pkg/PLIST 15 Nov 2011 15:43:52 -0000 1.11
> > +++ audio/gtkpod/pkg/PLIST 18 Aug 2013 16:50:15 -0000
> > @@ -132,3 +132,5 @@ share/locale/sv/LC_MESSAGES/gtkpod.mo
> > share/locale/zh_CN/LC_MESSAGES/gtkpod.mo
> > @exec %D/bin/update-desktop-database
> > @unexec-delete %D/bin/update-desktop-database
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> > Index: comms/chirp/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/comms/chirp/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 Makefile
> > --- comms/chirp/Makefile 14 Jun 2013 19:05:14 -0000 1.2
> > +++ comms/chirp/Makefile 18 Aug 2013 16:54:38 -0000
> > @@ -3,7 +3,7 @@
> > COMMENT= tool to programme a wide range of amateur radios
> >
> > MODPY_EGG_VERSION= 0.3.1
> > -REVISION= 0
> > +REVISION= 1
> > DISTNAME= chirp-${MODPY_EGG_VERSION}
> >
> > CATEGORIES= comms hamradio
> > @@ -18,9 +18,9 @@ MASTER_SITES= http://chirp.danplanet.com
> > MODULES= lang/python
> > COMMON_DEPS= devel/py-serial \
> > textproc/libxml,-python
> > -BUILD_DEPENDS= ${COMMON_DEPS} \
> > +BUILD_DEPENDS= ${COMMON_DEPS}
> > +RUN_DEPENDS= ${COMMON_DEPS} \
> > devel/desktop-file-utils
> > -RUN_DEPENDS= ${COMMON_DEPS}
> >
> > NO_TEST= Yes
> >
> > Index: databases/gq/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/databases/gq/Makefile,v
> > retrieving revision 1.48
> > diff -u -p -r1.48 Makefile
> > --- databases/gq/Makefile 20 Jun 2013 06:54:36 -0000 1.48
> > +++ databases/gq/Makefile 18 Aug 2013 16:57:14 -0000
> > @@ -3,7 +3,7 @@
> > COMMENT= GTK-based LDAP client
> >
> > DISTNAME= gq-1.3.4
> > -REVISION= 5
> > +REVISION= 6
> >
> > CATEGORIES= databases sysutils
> >
> > @@ -29,7 +29,8 @@ LIB_DEPENDS= databases/openldap \
> > devel/libglade2 \
> > x11/gnome/libgnome-keyring
> >
> > -RUN_DEPENDS= misc/shared-mime-info
> > +RUN_DEPENDS= misc/shared-mime-info \
> > + x11/gtk+2,-guic
> >
> > MODGNOME_TOOLS= yelp
> > MODGNOME_DESKTOP_FILE=Yes
> > Index: databases/soprano/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/databases/soprano/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- databases/soprano/Makefile 24 Apr 2013 08:34:45 -0000
1.10
> > +++ databases/soprano/Makefile 18 Aug 2013 17:00:01 -0000
> > @@ -5,6 +5,7 @@ COMMENT = RDF framework
> > CATEGORIES = databases devel textproc sysutils
> > HOMEPAGE = http://soprano.sourceforge.net/
> > DISTNAME = soprano-2.9.0
> > +REVISION = 0
> >
> > SHARED_LIBS = soprano 2.0
> > SHARED_LIBS += sopranoclient 2.0
> > @@ -21,8 +22,6 @@ MODULES = x11/kde4
> > MODKDE4_USE =
> >
> > BUILD_DEPENDS = devel/doxygen
> > -
> > -RUN_DEPENDS = devel/desktop-file-utils
> >
> > LIB_DEPENDS = textproc/clucene \
> > databases/iodbc \
> > Index: databases/soprano/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/databases/soprano/pkg/PLIST,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 PLIST
> > --- databases/soprano/pkg/PLIST 24 Apr 2013 08:34:45 -0000
1.6
> > +++ databases/soprano/pkg/PLIST 18 Aug 2013 17:00:01 -0000
> > @@ -188,5 +188,3 @@ share/soprano/plugins/virtuosobackend.de
> > share/soprano/rules/
> > share/soprano/rules/nrl.rules
> > share/soprano/rules/rdfs.rules
> > -@exec %D/bin/update-desktop-database
> > -@unexec-delete %D/bin/update-desktop-database
> > Index: devel/dconf/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/dconf/Makefile,v
> > retrieving revision 1.51
> > diff -u -p -r1.51 Makefile
> > --- devel/dconf/Makefile 17 Jul 2013 05:54:36 -0000 1.51
> > +++ devel/dconf/Makefile 18 Aug 2013 17:07:05 -0000
> > @@ -11,6 +11,8 @@ GNOME_VERSION= 0.16.1
> > PKGNAME-main= ${DISTNAME}
> > PKGNAME-editor= dconf-editor-${GNOME_VERSION}
> >
> > +REVISION-editor= 0
> > +
> > SHARED_LIBS += dconf 1.0 # 1.0.0
> > SHARED_LIBS += dconf-dbus-1 1.0 # 1.0.0
> >
> > @@ -54,7 +56,8 @@ LIB_DEPENDS-main= devel/glib2 \
> > x11/dbus
> >
> > RUN_DEPENDS-editor= ${RUN_DEPENDS} \
> > - devel/desktop-file-utils
> > + devel/desktop-file-utils \
> > + x11/gtk+2,-guic
> > LIB_DEPENDS-editor= ${MODGETTEXT_LIB_DEPENDS} \
> > ${BASE_PKGPATH},-main=${GNOME_VERSION} \
> > x11/gtk+3
> > Index: devel/ddd/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/ddd/Makefile,v
> > retrieving revision 1.63
> > diff -u -p -r1.63 Makefile
> > --- devel/ddd/Makefile 21 Mar 2013 08:45:14 -0000 1.63
> > +++ devel/ddd/Makefile 18 Aug 2013 17:09:38 -0000
> > @@ -3,7 +3,7 @@
> > COMMENT= Data Display Debugger, graphical front-end for GDB, etc
> >
> > DISTNAME= ddd-3.3.12
> > -REVISION= 4
> > +REVISION= 5
> > CATEGORIES= devel
> > MASTER_SITES= ${MASTER_SITE_GNU:=ddd/}
> >
> > @@ -18,6 +18,7 @@ WANTLIB= ICE SM X11 Xaw Xau Xdmcp Xext X
> >
> > MODULES= converters/libiconv
> >
> > +RUN_DEPENDS= devel/desktop-file-utils
> > LIB_DEPENDS= x11/openmotif
> >
> > TEST_IS_INTERACTIVE=x11
> > Index: devel/ddd/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/ddd/pkg/PLIST,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 PLIST
> > --- devel/ddd/pkg/PLIST 10 Apr 2011 18:01:13 -0000 1.14
> > +++ devel/ddd/pkg/PLIST 18 Aug 2013 17:09:38 -0000
> > @@ -47,3 +47,5 @@ share/doc/ddd/ddd-themes.pdf
> > share/doc/ddd/ddd.pdf
> > share/doc/ddd/html/
> > share/doc/ddd/html/ddd.html
> > +@exec %D/bin/update-desktop-database
> > +@unexec-delete %D/bin/update-desktop-database
> > Index: devel/geany/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/geany/Makefile,v
> > retrieving revision 1.41
> > diff -u -p -r1.41 Makefile
> > --- devel/geany/Makefile 31 May 2013 15:34:41 -0000 1.41
> > +++ devel/geany/Makefile 18 Aug 2013 17:11:27 -0000
> > @@ -5,7 +5,7 @@ SHARED_ONLY= Yes
> > COMMENT= small and lightweight IDE
> >
> > DISTNAME = geany-1.23
> > -REVISION = 0
> > +REVISION = 1
> >
> > CATEGORIES= devel
> >
> > Index: devel/geany/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/geany/pkg/PLIST,v
> > retrieving revision 1.19
> > diff -u -p -r1.19 PLIST
> > --- devel/geany/pkg/PLIST 8 Apr 2013 22:28:04 -0000 1.19
> > +++ devel/geany/pkg/PLIST 18 Aug 2013 17:11:27 -0000
> > @@ -257,3 +257,5 @@ share/locale/zh_TW/LC_MESSAGES/geany.mo
> > @unexec-delete %D/bin/update-desktop-database
> > @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > @unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/Tango
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/Tango
> > Index: devel/ipython/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/ipython/Makefile,v
> > retrieving revision 1.21
> > diff -u -p -r1.21 Makefile
> > --- devel/ipython/Makefile 6 Jun 2013 08:49:55 -0000 1.21
> > +++ devel/ipython/Makefile 18 Aug 2013 17:14:32 -0000
> > @@ -5,6 +5,7 @@ COMMENT= enhanced interactive Python sh
> > MODPY_EGG_VERSION= 0.13.2
> > DISTNAME= ipython-${MODPY_EGG_VERSION}
> > CATEGORIES= devel
> > +REVISION= 0
> >
> > HOMEPAGE= http://ipython.org/
> >
> > @@ -16,9 +17,10 @@ MODULES= lang/python
> > # sympy is also optional.
> > # There are a bunch of other event loops which are used in rare cases.
> > # These can be soft dependencies too.
> > -RUN_DEPENDS = textproc/py-pygments \
> > - graphics/py-matplotlib>=1.2.0 \
> > +RUN_DEPENDS = devel/desktop-file-utils \
> > net/py-zmq \
> > + graphics/py-matplotlib>=1.2.0 \
> > + textproc/py-pygments \
> > www/py-tornado
> > TEST_DEPENDS = devel/py-nose
> > BUILD_DEPENDS = textproc/py-sphinx \
> > Index: devel/poedit/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/devel/poedit/Makefile,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 Makefile
> > --- devel/poedit/Makefile 11 Mar 2013 10:50:24 -0000 1.17
> > +++ devel/poedit/Makefile 18 Aug 2013 17:18:03 -0000
> > @@ -19,7 +19,8 @@ USE_GROFF = Yes
> >
> > WANTLIB= c m pthread stdc++ wx_base_xml wx_gtk2_html wx_gtk2_adv \
> > wx_gtk2_xrc wx_base wx_gtk2_core
> > -RUN_DEPENDS= devel/desktop-file-utils
> > +RUN_DEPENDS= devel/desktop-file-utils \
> > + x11/gtk+2,-guic
> > LIB_DEPENDS= x11/wxWidgets>=2.6.3
> >
> > CONFIGURE_STYLE=gnu
> > Index: devel/poedit/pkg/PLIST
> > ===================================================================
> > RCS file: /cvs/ports/devel/poedit/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 PLIST
> > --- devel/poedit/pkg/PLIST 22 Dec 2009 15:31:27 -0000 1.4
> > +++ devel/poedit/pkg/PLIST 18 Aug 2013 17:18:03 -0000
> > @@ -209,3 +209,5 @@ share/poedit/icons/poedit-update.png
> > share/poedit/icons/view-fullscreen.png
> > @exec %D/bin/update-desktop-database
> > @unexec-delete %D/bin/update-desktop-database
> > +@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> > +@unexec-delete %D/bin/gtk-update-icon-cache -q -t
%D/share/icons/hicolor
> >
>
> --
> Antoine
