From 43bd9f14d9ce11690e9538bf3b03d3462faa6dbe Mon Sep 17 00:00:00 2001 From: marcus Date: Wed, 24 Oct 2007 23:37:25 +0000 Subject: Presenting GNOME 2.20.1 and all related works for FreeBSD. The official GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338 --- textproc/meld/Makefile | 7 ++----- textproc/meld/pkg-plist | 13 +++++++------ 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'textproc/meld') diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile index 96da82f7c76..021d7d465d0 100644 --- a/textproc/meld/Makefile +++ b/textproc/meld/Makefile @@ -7,6 +7,7 @@ PORTNAME= meld PORTVERSION= 1.1.5.1 +PORTREVISION= 1 CATEGORIES= textproc devel python MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R:R} @@ -28,11 +29,7 @@ INSTALLS_OMF= yes post-patch: @${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ; \ - s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ; \ - s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|g ; \ - s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \ - s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g' + 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' .include diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist index b82347c538c..e4ab87014be 100644 --- a/textproc/meld/pkg-plist +++ b/textproc/meld/pkg-plist @@ -68,17 +68,17 @@ lib/meld/vc/tla.pyo lib/meld/vcview.py lib/meld/vcview.pyc lib/meld/vcview.pyo -share/gnome/application-registry/meld.applications -share/gnome/applications/meld.desktop +share/application-registry/meld.applications +share/applications/meld.desktop share/gnome/help/meld/C/figures/dirdiff.png share/gnome/help/meld/C/figures/filediff.png share/gnome/help/meld/C/meld.xml share/gnome/help/meld/es/figures/dirdiff.png share/gnome/help/meld/es/figures/filediff.png share/gnome/help/meld/es/meld.xml -share/gnome/omf/meld/meld-C.omf -share/gnome/omf/meld/meld-es.omf -share/gnome/pixmaps/meld.png +share/omf/meld/meld-C.omf +share/omf/meld/meld-es.omf +share/pixmaps/meld.png share/locale/ar/LC_MESSAGES/meld.mo share/locale/bg/LC_MESSAGES/meld.mo share/locale/ca/LC_MESSAGES/meld.mo @@ -144,7 +144,7 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo @dirrm %%DATADIR%% @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw -@dirrm share/gnome/omf/meld +@dirrm share/omf/meld @dirrm share/gnome/help/meld/es/figures @dirrm share/gnome/help/meld/es @dirrm share/gnome/help/meld/C/figures @@ -154,3 +154,4 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo @dirrm %%DOCSDIR%% @dirrm lib/meld/vc @dirrm lib/meld +@dirrmtry share/applications -- cgit