diff options
330 files changed, 4141 insertions, 3366 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 98d621350f0c..475f05818565 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.8 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo index f147d65aeeea..6440a59679ae 100644 --- a/accessibility/at-spi/distinfo +++ b/accessibility/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-1.0.2.tar.bz2) = a242b806b58d924b7f58f769ff4e2298 +MD5 (gnome2/at-spi-1.1.8.tar.bz2) = 76e2df52a280a794bde0e6dd259c01f8 diff --git a/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c b/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c new file mode 100644 index 000000000000..161b17116292 --- /dev/null +++ b/accessibility/at-spi/files/patch-registryd_deviceeventcontroller.c @@ -0,0 +1,10 @@ +--- registryd/deviceeventcontroller.c.orig Wed Nov 27 16:36:12 2002 ++++ registryd/deviceeventcontroller.c Wed Nov 27 16:38:21 2002 +@@ -32,6 +32,7 @@ + #include <string.h> + #include <ctype.h> + #include <stdio.h> ++#include <sys/time.h> + #include <bonobo/bonobo-exception.h> + + #include <X11/Xlib.h> diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist index 4b89257f26e7..639018a75a67 100644 --- a/accessibility/at-spi/pkg-plist +++ b/accessibility/at-spi/pkg-plist @@ -9,6 +9,7 @@ include/at-spi-1.0/libspi/action.h include/at-spi-1.0/libspi/application.h include/at-spi-1.0/libspi/base.h include/at-spi-1.0/libspi/component.h +include/at-spi-1.0/libspi/devicelistener.h include/at-spi-1.0/libspi/editabletext.h include/at-spi-1.0/libspi/eventlistener.h include/at-spi-1.0/libspi/hyperlink.h @@ -27,10 +28,10 @@ include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h lib/libcspi.a lib/libcspi.so -lib/libcspi.so.1 +lib/libcspi.so.8 lib/libspi.a lib/libspi.so -lib/libspi.so.1 +lib/libspi.so.8 lib/gtk-2.0/modules/libatk-bridge.so lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server @@ -55,8 +56,7 @@ share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c6121.html -share/doc/at-spi-cspi/c6124.html +share/doc/at-spi-cspi/c5968.html share/doc/at-spi-cspi/index.sgml share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 5b20ed3bce09..6ca7fa395a88 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -6,11 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.0.3 +PORTVERSION= 1.2.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 #MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ # ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ # http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,19 +20,19 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static +USE_GNOMENG= yes +USE_GNOME= gnomehack +CONFIGURE_ARGS= --enable-static \ + --disable-gtk-doc \ + --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index e6cf774217f5..50cdc842bcf9 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1 +1 @@ -MD5 (gnome2/atk-1.0.3.tar.bz2) = 9041396017f8207b8aa2bece27eb5ebb +MD5 (gnome2/atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c diff --git a/accessibility/atk/files/patch-Makefile.in b/accessibility/atk/files/patch-Makefile.in index be30e08fdddc..90d6da723065 100644 --- a/accessibility/atk/files/patch-Makefile.in +++ b/accessibility/atk/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Aug 1 20:32:06 2001 -+++ Makefile.in Wed Aug 1 20:33:45 2001 -@@ -96,7 +96,7 @@ - STRIP = @STRIP@ - VERSION = @VERSION@ +--- Makefile.in.orig Fri Nov 8 17:09:46 2002 ++++ Makefile.in Fri Nov 8 17:10:22 2002 +@@ -116,7 +116,7 @@ + atktargetlib = @atktargetlib@ + ms_librarian = @ms_librarian@ --SUBDIRS = atk tests docs -+SUBDIRS = atk +-SUBDIRS = atk tests docs po ++SUBDIRS = atk docs po - EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in + EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in atk.spec.in atk.spec atk-zip.sh diff --git a/accessibility/atk/files/patch-docs_Makefile.in b/accessibility/atk/files/patch-docs_Makefile.in new file mode 100644 index 000000000000..b40046ee22c3 --- /dev/null +++ b/accessibility/atk/files/patch-docs_Makefile.in @@ -0,0 +1,10 @@ +--- docs/Makefile.in.orig Fri Jan 24 16:45:09 2003 ++++ docs/Makefile.in Fri Jan 24 16:45:09 2003 +@@ -274,6 +274,7 @@ + dist-hook-local: all-local + + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp ++@ENABLE_GTK_DOC_FALSE@all-local: + + #### scan #### + diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index a657b8a6397a..43664cddbf4e 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -15,6 +15,7 @@ include/atk-1.0/atk/atkobjectfactory.h include/atk-1.0/atk/atkregistry.h include/atk-1.0/atk/atkrelation.h include/atk-1.0/atk/atkrelationset.h +include/atk-1.0/atk/atkrelationtype.h include/atk-1.0/atk/atkselection.h include/atk-1.0/atk/atkstate.h include/atk-1.0/atk/atkstateset.h @@ -25,7 +26,59 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.0 +lib/libatk-1.0.so.200 libdata/pkgconfig/atk.pc +share/doc/atk/atk-atkstate.html +share/doc/atk/atk.html +share/doc/atk/atkaction.html +share/doc/atk/atkcomponent.html +share/doc/atk/atkdocument.html +share/doc/atk/atkeditabletext.html +share/doc/atk/atkhypertext.html +share/doc/atk/atkimage.html +share/doc/atk/atkgobjectaccessible.html +share/doc/atk/atkhyperlink.html +share/doc/atk/atknoopobject.html +share/doc/atk/atknoopobjectfactory.html +share/doc/atk/atkobject.html +share/doc/atk/atkobjectfactory.html +share/doc/atk/atkregistry.html +share/doc/atk/atkrelation.html +share/doc/atk/atkrelationset.html +share/doc/atk/atkselection.html +share/doc/atk/atkstateset.html +share/doc/atk/atkstreamablecontent.html +share/doc/atk/atktable.html +share/doc/atk/atktext.html +share/doc/atk/atkutil.html +share/doc/atk/atkvalue.html +share/doc/atk/book1.html +share/doc/atk/index.sgml +share/locale/bg/LC_MESSAGES/atk10.mo +share/locale/ca/LC_MESSAGES/atk10.mo +share/locale/cs/LC_MESSAGES/atk10.mo +share/locale/da/LC_MESSAGES/atk10.mo +share/locale/de/LC_MESSAGES/atk10.mo +share/locale/el/LC_MESSAGES/atk10.mo +share/locale/en_GB/LC_MESSAGES/atk10.mo +share/locale/es/LC_MESSAGES/atk10.mo +share/locale/fi/LC_MESSAGES/atk10.mo +share/locale/fr/LC_MESSAGES/atk10.mo +share/locale/he/LC_MESSAGES/atk10.mo +share/locale/hu/LC_MESSAGES/atk10.mo +share/locale/it/LC_MESSAGES/atk10.mo +share/locale/ko/LC_MESSAGES/atk10.mo +share/locale/lv/LC_MESSAGES/atk10.mo +share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/nl/LC_MESSAGES/atk10.mo +share/locale/no/LC_MESSAGES/atk10.mo +share/locale/pl/LC_MESSAGES/atk10.mo +share/locale/ru/LC_MESSAGES/atk10.mo +share/locale/sq/LC_MESSAGES/atk10.mo +share/locale/sv/LC_MESSAGES/atk10.mo +share/locale/uk/LC_MESSAGES/atk10.mo +share/locale/vi/LC_MESSAGES/atk10.mo +share/locale/zh_CN/LC_MESSAGES/atk10.mo +@dirrm share/doc/atk @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile index 48007940b9a7..c3515535376d 100644 --- a/accessibility/gail/Makefile +++ b/accessibility/gail/Makefile @@ -6,29 +6,27 @@ # PORTNAME= gail -PORTVERSION= 0.17 +PORTVERSION= 1.2.0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas +LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtk-doc +CONFIGURE_ARGS= --disable-gtk-doc \ + --with-html-dir=${PREFIX}/share/doc CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo index 0f5e123e0b37..e0c656f9b85e 100644 --- a/accessibility/gail/distinfo +++ b/accessibility/gail/distinfo @@ -1 +1 @@ -MD5 (gnome2/gail-0.17.tar.bz2) = 23d73923bd0947d5c975afa13b2de3a3 +MD5 (gnome2/gail-1.2.0.tar.bz2) = 8b5b960eb4f71656ff798e63401d1bf0 diff --git a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in index a112ecbdca64..e69de29bb2d1 100644 --- a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in +++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -1,11 +0,0 @@ ---- docs/reference/libgail-util/Makefile.in.orig Tue Jul 23 12:42:03 2002 -+++ docs/reference/libgail-util/Makefile.in Tue Jul 23 12:42:30 2002 -@@ -103,7 +103,7 @@ - - INSTALLDIR = $(prefix)/share/gtk-doc - --HTML_DIR = ${datadir}/gtk-doc/html -+HTML_DIR = $(prefix)/share/doc - - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 9c69cdcabc10..804b2c5656ee 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -6,30 +6,37 @@ # PORTNAME= fileroller -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.1 PORTEPOCH= 1 CATEGORIES= archivers gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/file-roller/2.2 DISTNAME= file-roller-${PORTVERSION} +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ lha:${PORTSDIR}/archivers/lha \ - rar:${PORTSDIR}/archivers/rar \ lzop:${PORTSDIR}/archivers/lzop + USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if defined(WITH_RAR) || exists(${LOCALBASE}/bin/rar) +RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} @@ -38,4 +45,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index b6e3c02cab40..48bf924a04cf 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1 +1 @@ -MD5 (file-roller-2.0.4.tar.gz) = 533e4ad3f8d5c9a1ba550de7c4a1d2d0 +MD5 (gnome2/file-roller-2.2.1.tar.gz) = 2b8e07829a65ce5e34cd008dabf1e63c diff --git a/databases/libgda2/files/patch-configure b/archivers/file-roller/files/patch-configure index d744b24f81e8..53e3c887712a 100644 --- a/databases/libgda2/files/patch-configure +++ b/archivers/file-roller/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Jun 2 22:12:29 2002 -+++ configure Sun Jun 2 22:13:06 2002 -@@ -8429,6 +8429,7 @@ +--- configure.orig Tue Dec 10 23:18:40 2002 ++++ configure Tue Dec 10 23:18:59 2002 +@@ -6403,6 +6403,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 6139ada58184..198b20035aed 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -8,19 +8,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml etc/gconf/schemas/file-roller.schemas +lib/bonobo/libfile-roller-component.so +libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%share/doc/fileroller/AUTHORS %%PORTDOCS%%share/doc/fileroller/NEWS %%PORTDOCS%%share/doc/fileroller/README %%PORTDOCS%%share/doc/fileroller/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop -share/gnome/file-roller/glade/file_roller.glade2 -share/gnome/file-roller/glade/file_roller_prop.glade2 -share/gnome/file-roller/scripts/Add_to_archive -share/gnome/file-roller/scripts/Extract_here -share/gnome/file-roller/scripts/Extract_in_a_subfolder -share/gnome/file-roller/scripts/Extract_to -share/gnome/file-roller/scripts/README +share/gnome/file-roller/glade/file_roller.glade +share/gnome/file-roller/glade/file_roller_prop.glade share/gnome/help/file-roller/C/figures/fr-add-dialog.png share/gnome/help/file-roller/C/figures/fr-extract.png share/gnome/help/file-roller/C/figures/fr-mainwindow.png @@ -36,32 +33,50 @@ share/gnome/help/file-roller/ru/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/file-roller/file-roller-ru.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/file-roller.png +share/locale/am/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo +share/locale/cs/LC_MESSAGES/file-roller.mo +share/locale/da/LC_MESSAGES/file-roller.mo share/locale/de/LC_MESSAGES/file-roller.mo +share/locale/el/LC_MESSAGES/file-roller.mo share/locale/es/LC_MESSAGES/file-roller.mo +share/locale/et/LC_MESSAGES/file-roller.mo +share/locale/fi/LC_MESSAGES/file-roller.mo share/locale/fr/LC_MESSAGES/file-roller.mo +share/locale/hi/LC_MESSAGES/file-roller.mo +share/locale/hu/LC_MESSAGES/file-roller.mo share/locale/it/LC_MESSAGES/file-roller.mo share/locale/ja/LC_MESSAGES/file-roller.mo share/locale/ko/LC_MESSAGES/file-roller.mo +share/locale/lv/LC_MESSAGES/file-roller.mo +share/locale/mk/LC_MESSAGES/file-roller.mo +share/locale/mn/LC_MESSAGES/file-roller.mo share/locale/ms/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo +share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/ro/LC_MESSAGES/file-roller.mo share/locale/ru/LC_MESSAGES/file-roller.mo +share/locale/sk/LC_MESSAGES/file-roller.mo +share/locale/sl/LC_MESSAGES/file-roller.mo +share/locale/sq/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo +share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo +share/locale/zh_CN/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru @dirrm share/gnome/help/file-roller/C/figures @dirrm share/gnome/help/file-roller/C @dirrm share/gnome/help/file-roller -@dirrm share/gnome/file-roller/scripts @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui @@ -72,3 +87,5 @@ share/locale/vi/LC_MESSAGES/file-roller.mo @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index 9c69cdcabc10..804b2c5656ee 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -6,30 +6,37 @@ # PORTNAME= fileroller -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.1 PORTEPOCH= 1 CATEGORIES= archivers gnome -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/file-roller/2.2 DISTNAME= file-roller-${PORTVERSION} +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ lha:${PORTSDIR}/archivers/lha \ - rar:${PORTSDIR}/archivers/rar \ lzop:${PORTSDIR}/archivers/lzop + USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack -GNU_CONFIGURE= yes +USE_LIBTOOL= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +.include <bsd.port.pre.mk> + +.if defined(WITH_RAR) || exists(${LOCALBASE}/bin/rar) +RUN_DEPENDS+= rar:${PORTSDIR}/archivers/rar +.endif + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} @@ -38,4 +45,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index b6e3c02cab40..48bf924a04cf 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1 +1 @@ -MD5 (file-roller-2.0.4.tar.gz) = 533e4ad3f8d5c9a1ba550de7c4a1d2d0 +MD5 (gnome2/file-roller-2.2.1.tar.gz) = 2b8e07829a65ce5e34cd008dabf1e63c diff --git a/databases/libgda3/files/patch-configure b/archivers/fileroller/files/patch-configure index d744b24f81e8..53e3c887712a 100644 --- a/databases/libgda3/files/patch-configure +++ b/archivers/fileroller/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Jun 2 22:12:29 2002 -+++ configure Sun Jun 2 22:13:06 2002 -@@ -8429,6 +8429,7 @@ +--- configure.orig Tue Dec 10 23:18:40 2002 ++++ configure Tue Dec 10 23:18:59 2002 +@@ -6403,6 +6403,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index 6139ada58184..198b20035aed 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -8,19 +8,16 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml etc/gconf/schemas/file-roller.schemas +lib/bonobo/libfile-roller-component.so +libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%share/doc/fileroller/AUTHORS %%PORTDOCS%%share/doc/fileroller/NEWS %%PORTDOCS%%share/doc/fileroller/README %%PORTDOCS%%share/doc/fileroller/TODO share/gnome/application-registry/file-roller.applications share/gnome/applications/file-roller.desktop -share/gnome/file-roller/glade/file_roller.glade2 -share/gnome/file-roller/glade/file_roller_prop.glade2 -share/gnome/file-roller/scripts/Add_to_archive -share/gnome/file-roller/scripts/Extract_here -share/gnome/file-roller/scripts/Extract_in_a_subfolder -share/gnome/file-roller/scripts/Extract_to -share/gnome/file-roller/scripts/README +share/gnome/file-roller/glade/file_roller.glade +share/gnome/file-roller/glade/file_roller_prop.glade share/gnome/help/file-roller/C/figures/fr-add-dialog.png share/gnome/help/file-roller/C/figures/fr-extract.png share/gnome/help/file-roller/C/figures/fr-mainwindow.png @@ -36,32 +33,50 @@ share/gnome/help/file-roller/ru/legal.xml share/gnome/mime-info/file-roller.keys share/gnome/mime-info/file-roller.mime share/gnome/omf/file-roller/file-roller-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/file-roller/file-roller-ru.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/file-roller.png +share/locale/am/LC_MESSAGES/file-roller.mo share/locale/bg/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo +share/locale/cs/LC_MESSAGES/file-roller.mo +share/locale/da/LC_MESSAGES/file-roller.mo share/locale/de/LC_MESSAGES/file-roller.mo +share/locale/el/LC_MESSAGES/file-roller.mo share/locale/es/LC_MESSAGES/file-roller.mo +share/locale/et/LC_MESSAGES/file-roller.mo +share/locale/fi/LC_MESSAGES/file-roller.mo share/locale/fr/LC_MESSAGES/file-roller.mo +share/locale/hi/LC_MESSAGES/file-roller.mo +share/locale/hu/LC_MESSAGES/file-roller.mo share/locale/it/LC_MESSAGES/file-roller.mo share/locale/ja/LC_MESSAGES/file-roller.mo share/locale/ko/LC_MESSAGES/file-roller.mo +share/locale/lv/LC_MESSAGES/file-roller.mo +share/locale/mk/LC_MESSAGES/file-roller.mo +share/locale/mn/LC_MESSAGES/file-roller.mo share/locale/ms/LC_MESSAGES/file-roller.mo share/locale/nl/LC_MESSAGES/file-roller.mo share/locale/no/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo +share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/ro/LC_MESSAGES/file-roller.mo share/locale/ru/LC_MESSAGES/file-roller.mo +share/locale/sk/LC_MESSAGES/file-roller.mo +share/locale/sl/LC_MESSAGES/file-roller.mo +share/locale/sq/LC_MESSAGES/file-roller.mo share/locale/sv/LC_MESSAGES/file-roller.mo +share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo +share/locale/zh_CN/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru @dirrm share/gnome/help/file-roller/C/figures @dirrm share/gnome/help/file-roller/C @dirrm share/gnome/help/file-roller -@dirrm share/gnome/file-roller/scripts @dirrm share/gnome/file-roller/glade @dirrm share/gnome/file-roller @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui @@ -72,3 +87,5 @@ share/locale/vi/LC_MESSAGES/file-roller.mo @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 2a08bee55777..f8c711f38649 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,18 +6,19 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.0.3 +PORTVERSION= 2.2.1.1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.0 +MASTER_SITE_SUBDIR= sources/gnome-media/2.2 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - gailutil.17:${PORTSDIR}/x11-toolkits/gail +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + gailutil.17:${PORTSDIR}/x11-toolkits/gail \ + gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index bd143fdc2e55..8c7d07000461 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-media-2.0.3.tar.bz2) = a39abb3c2f49d09d21c57b6ee6e5d0ff +MD5 (gnome2/gnome-media-2.2.1.1.tar.bz2) = 64ec57dd4dce68e2f1ad12c3e46121cb diff --git a/audio/gnome-media/files/patch-ad b/audio/gnome-media/files/patch-ad index 9dc4efce4c88..f49a888a5a99 100644 --- a/audio/gnome-media/files/patch-ad +++ b/audio/gnome-media/files/patch-ad @@ -1,5 +1,5 @@ ---- gmix/gmix.c.orig Tue May 7 00:43:15 2002 -+++ gmix/gmix.c Tue May 7 00:47:38 2002 +--- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 ++++ gmix/gmix.c Fri Oct 11 09:20:13 2002 @@ -60,7 +60,7 @@ #ifdef HAVE_LINUX_SOUNDCARD_H #include <linux/soundcard.h> @@ -9,21 +9,7 @@ #endif #endif -@@ -569,12 +569,7 @@ - /* - * open the mixer-device - */ -- if (num == 0) { -- sprintf (device_name, "/dev/mixer"); -- } else { -- sprintf (device_name, "/dev/mixer%i", num); -- } -- -+ sprintf(device_name, "/dev/mixer%i", num); - new_device->fd = open (device_name, O_RDWR, 0); - - if (new_device->fd < 0) { -@@ -689,6 +684,7 @@ +@@ -722,6 +722,7 @@ cnt = 0; devices = NULL; @@ -31,7 +17,7 @@ device_by_name = g_hash_table_new (g_str_hash, g_str_equal); do { -@@ -697,9 +693,8 @@ +@@ -730,9 +731,8 @@ devices = g_list_append (devices, new_device); g_hash_table_insert (device_by_name, new_device->info.name, new_device); } diff --git a/audio/gnome-media/files/patch-configure b/audio/gnome-media/files/patch-configure index 69445f92cc6d..d5e0e924c1a7 100644 --- a/audio/gnome-media/files/patch-configure +++ b/audio/gnome-media/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue May 7 01:02:03 2002 -+++ configure Tue May 7 01:04:35 2002 -@@ -7978,6 +7978,7 @@ +--- configure.orig Thu Jan 23 17:55:03 2003 ++++ configure Tue Feb 4 20:31:01 2003 +@@ -8336,6 +8336,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 3192730368c2..8b5ddb7c66ba 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -2,14 +2,17 @@ bin/cddb-slave2-properties bin/gnome-cd bin/gnome-sound-recorder bin/gnome-volume-control +bin/gstreamer-properties bin/vumeter etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml etc/gconf/schemas/CDDB-Slave2.schemas etc/gconf/schemas/gnome-cd.schemas @@ -28,6 +31,9 @@ share/gnome/applications/gnome-volume-control.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop share/gnome/control-center-2.0/capplets/cddb-slave.desktop +share/gnome/gnome-media-2.0/icons/gstreamer-properties.png +share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade +share/gnome/gnome-sound-recorder/ui/gsr.xml share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png @@ -45,82 +51,40 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png share/gnome/help/gnome-cd/C/figures/stop_button.png share/gnome/help/gnome-cd/C/gnome-cd.xml share/gnome/help/gnome-cd/C/legal.xml +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/C/legal.xml share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml -share/gnome/help/grecord/C/figures/grecord-prefs-path.png -share/gnome/help/grecord/C/figures/grecord-prefs-play.png -share/gnome/help/grecord/C/figures/grecord-prefs-rec.png -share/gnome/help/grecord/C/figures/grecord-prefs-sound.png -share/gnome/help/grecord/C/figures/grecord-prefs-ui.png -share/gnome/help/grecord/C/figures/grecord.png -share/gnome/help/grecord/C/figures/grecord_window.png -share/gnome/help/grecord/C/grecord.xml -share/gnome/help/grecord/C/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-volume-control-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-cd.png -share/gnome/pixmaps/gnome-cd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/a-eject-pressed.png -share/gnome/pixmaps/gnome-cd/a-eject.png -share/gnome/pixmaps/gnome-cd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/a-first-pressed.png -share/gnome/pixmaps/gnome-cd/a-first.png -share/gnome/pixmaps/gnome-cd/a-fwd-pressed.png -share/gnome/pixmaps/gnome-cd/a-fwd.png -share/gnome/pixmaps/gnome-cd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/a-last-pressed.png -share/gnome/pixmaps/gnome-cd/a-last.png -share/gnome/pixmaps/gnome-cd/a-pause-pressed.png -share/gnome/pixmaps/gnome-cd/a-pause.png -share/gnome/pixmaps/gnome-cd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/a-play-pressed.png -share/gnome/pixmaps/gnome-cd/a-play.png -share/gnome/pixmaps/gnome-cd/a-rwnd-pressed.png -share/gnome/pixmaps/gnome-cd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/a-stop-pressed.png -share/gnome/pixmaps/gnome-cd/a-stop.png -share/gnome/pixmaps/gnome-cd/back.xpm share/gnome/pixmaps/gnome-cd/cd.png -share/gnome/pixmaps/gnome-cd/cdrom.xpm share/gnome/pixmaps/gnome-cd/disc.png -share/gnome/pixmaps/gnome-cd/eject.xpm -share/gnome/pixmaps/gnome-cd/ffwd.xpm -share/gnome/pixmaps/gnome-cd/goto.xpm share/gnome/pixmaps/gnome-cd/media-eject.png -share/gnome/pixmaps/gnome-cd/media-fwd.png +share/gnome/pixmaps/gnome-cd/media-ffwd.png share/gnome/pixmaps/gnome-cd/media-next.png share/gnome/pixmaps/gnome-cd/media-pause.png share/gnome/pixmaps/gnome-cd/media-play.png share/gnome/pixmaps/gnome-cd/media-prev.png -share/gnome/pixmaps/gnome-cd/media-rec.png -share/gnome/pixmaps/gnome-cd/media-rew.png +share/gnome/pixmaps/gnome-cd/media-record.png +share/gnome/pixmaps/gnome-cd/media-rewind.png share/gnome/pixmaps/gnome-cd/media-stop.png -share/gnome/pixmaps/gnome-cd/mixer.png -share/gnome/pixmaps/gnome-cd/next.xpm share/gnome/pixmaps/gnome-cd/once.png -share/gnome/pixmaps/gnome-cd/pause.xpm -share/gnome/pixmaps/gnome-cd/play.xpm share/gnome/pixmaps/gnome-cd/repeat.png -share/gnome/pixmaps/gnome-cd/rewind.xpm -share/gnome/pixmaps/gnome-cd/stop.xpm -share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-first.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-fwd.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-last.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-pause.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-play.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png @@ -131,22 +95,9 @@ share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/top.png -share/gnome/pixmaps/gnome-cd/themes/media/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-stop-menu.png share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/media/bottom.png -share/gnome/pixmaps/gnome-cd/themes/media/media-eject.png -share/gnome/pixmaps/gnome-cd/themes/media/media-fwd.png -share/gnome/pixmaps/gnome-cd/themes/media/media-next.png -share/gnome/pixmaps/gnome-cd/themes/media/media-pause.png -share/gnome/pixmaps/gnome-cd/themes/media/media-play.png -share/gnome/pixmaps/gnome-cd/themes/media/media-prev.png -share/gnome/pixmaps/gnome-cd/themes/media/media-rew.png -share/gnome/pixmaps/gnome-cd/themes/media/media-stop.png share/gnome/pixmaps/gnome-cd/themes/media/media.theme share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png @@ -154,19 +105,6 @@ share/gnome/pixmaps/gnome-cd/themes/media/middle.png share/gnome/pixmaps/gnome-cd/themes/media/top-left.png share/gnome/pixmaps/gnome-cd/themes/media/top-right.png share/gnome/pixmaps/gnome-cd/themes/media/top.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-fwd.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-pause.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png @@ -178,7 +116,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png -share/gnome/pixmaps/gnome-cd/volume.xpm share/gnome/pixmaps/gnome-grecord.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png @@ -186,6 +123,7 @@ share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png share/gnome/pixmaps/gnome-vumeter.png +share/gnome/pixmaps/gstreamer-properties.png share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/az/LC_MESSAGES/gnome-media-2.0.mo @@ -204,12 +142,15 @@ share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo +share/locale/he/LC_MESSAGES/gnome-media-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo share/locale/it/LC_MESSAGES/gnome-media-2.0.mo share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo @@ -221,6 +162,7 @@ share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo @@ -235,20 +177,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd -@dirrm share/gnome/help/grecord/C/figures -@dirrm share/gnome/help/grecord/C -@dirrm share/gnome/help/grecord +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control +@dirrm share/gnome/help/gnome-sound-recorder/C/figures +@dirrm share/gnome/help/gnome-sound-recorder/C +@dirrm share/gnome/help/gnome-sound-recorder @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 2a08bee55777..f8c711f38649 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,18 +6,19 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.0.3 +PORTVERSION= 2.2.1.1 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.0 +MASTER_SITE_SUBDIR= sources/gnome-media/2.2 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - gailutil.17:${PORTSDIR}/x11-toolkits/gail +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + gailutil.17:${PORTSDIR}/x11-toolkits/gail \ + gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index bd143fdc2e55..8c7d07000461 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-media-2.0.3.tar.bz2) = a39abb3c2f49d09d21c57b6ee6e5d0ff +MD5 (gnome2/gnome-media-2.2.1.1.tar.bz2) = 64ec57dd4dce68e2f1ad12c3e46121cb diff --git a/audio/gnomemedia2/files/patch-ad b/audio/gnomemedia2/files/patch-ad index 9dc4efce4c88..f49a888a5a99 100644 --- a/audio/gnomemedia2/files/patch-ad +++ b/audio/gnomemedia2/files/patch-ad @@ -1,5 +1,5 @@ ---- gmix/gmix.c.orig Tue May 7 00:43:15 2002 -+++ gmix/gmix.c Tue May 7 00:47:38 2002 +--- gmix/gmix.c.orig Tue Oct 8 19:40:43 2002 ++++ gmix/gmix.c Fri Oct 11 09:20:13 2002 @@ -60,7 +60,7 @@ #ifdef HAVE_LINUX_SOUNDCARD_H #include <linux/soundcard.h> @@ -9,21 +9,7 @@ #endif #endif -@@ -569,12 +569,7 @@ - /* - * open the mixer-device - */ -- if (num == 0) { -- sprintf (device_name, "/dev/mixer"); -- } else { -- sprintf (device_name, "/dev/mixer%i", num); -- } -- -+ sprintf(device_name, "/dev/mixer%i", num); - new_device->fd = open (device_name, O_RDWR, 0); - - if (new_device->fd < 0) { -@@ -689,6 +684,7 @@ +@@ -722,6 +722,7 @@ cnt = 0; devices = NULL; @@ -31,7 +17,7 @@ device_by_name = g_hash_table_new (g_str_hash, g_str_equal); do { -@@ -697,9 +693,8 @@ +@@ -730,9 +731,8 @@ devices = g_list_append (devices, new_device); g_hash_table_insert (device_by_name, new_device->info.name, new_device); } diff --git a/audio/gnomemedia2/files/patch-configure b/audio/gnomemedia2/files/patch-configure index 69445f92cc6d..d5e0e924c1a7 100644 --- a/audio/gnomemedia2/files/patch-configure +++ b/audio/gnomemedia2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue May 7 01:02:03 2002 -+++ configure Tue May 7 01:04:35 2002 -@@ -7978,6 +7978,7 @@ +--- configure.orig Thu Jan 23 17:55:03 2003 ++++ configure Tue Feb 4 20:31:01 2003 +@@ -8336,6 +8336,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index 3192730368c2..8b5ddb7c66ba 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -2,14 +2,17 @@ bin/cddb-slave2-properties bin/gnome-cd bin/gnome-sound-recorder bin/gnome-volume-control +bin/gstreamer-properties bin/vumeter etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-volume-control/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control/%gconf.xml etc/gconf/schemas/CDDB-Slave2.schemas etc/gconf/schemas/gnome-cd.schemas @@ -28,6 +31,9 @@ share/gnome/applications/gnome-volume-control.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop share/gnome/control-center-2.0/capplets/cddb-slave.desktop +share/gnome/gnome-media-2.0/icons/gstreamer-properties.png +share/gnome/gnome-media-2.0/interfaces/gstreamer-properties.glade +share/gnome/gnome-sound-recorder/ui/gsr.xml share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_button.png share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png share/gnome/help/gnome-cd/C/figures/cdplayer_window.png @@ -45,82 +51,40 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png share/gnome/help/gnome-cd/C/figures/stop_button.png share/gnome/help/gnome-cd/C/gnome-cd.xml share/gnome/help/gnome-cd/C/legal.xml +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord.png +share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png +share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml +share/gnome/help/gnome-sound-recorder/C/legal.xml share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png share/gnome/help/gnome-volume-control/C/figures/gmix.png share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml share/gnome/help/gnome-volume-control/C/legal.xml -share/gnome/help/grecord/C/figures/grecord-prefs-path.png -share/gnome/help/grecord/C/figures/grecord-prefs-play.png -share/gnome/help/grecord/C/figures/grecord-prefs-rec.png -share/gnome/help/grecord/C/figures/grecord-prefs-sound.png -share/gnome/help/grecord/C/figures/grecord-prefs-ui.png -share/gnome/help/grecord/C/figures/grecord.png -share/gnome/help/grecord/C/figures/grecord_window.png -share/gnome/help/grecord/C/grecord.xml -share/gnome/help/grecord/C/legal.xml share/gnome/idl/GNOME_Media_CDDBSlave2.idl share/gnome/omf/gnome-media/gnome-cd-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/gnome-volume-control-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-media/grecord-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-cd.png -share/gnome/pixmaps/gnome-cd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/a-eject-pressed.png -share/gnome/pixmaps/gnome-cd/a-eject.png -share/gnome/pixmaps/gnome-cd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/a-first-pressed.png -share/gnome/pixmaps/gnome-cd/a-first.png -share/gnome/pixmaps/gnome-cd/a-fwd-pressed.png -share/gnome/pixmaps/gnome-cd/a-fwd.png -share/gnome/pixmaps/gnome-cd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/a-last-pressed.png -share/gnome/pixmaps/gnome-cd/a-last.png -share/gnome/pixmaps/gnome-cd/a-pause-pressed.png -share/gnome/pixmaps/gnome-cd/a-pause.png -share/gnome/pixmaps/gnome-cd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/a-play-pressed.png -share/gnome/pixmaps/gnome-cd/a-play.png -share/gnome/pixmaps/gnome-cd/a-rwnd-pressed.png -share/gnome/pixmaps/gnome-cd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/a-stop-pressed.png -share/gnome/pixmaps/gnome-cd/a-stop.png -share/gnome/pixmaps/gnome-cd/back.xpm share/gnome/pixmaps/gnome-cd/cd.png -share/gnome/pixmaps/gnome-cd/cdrom.xpm share/gnome/pixmaps/gnome-cd/disc.png -share/gnome/pixmaps/gnome-cd/eject.xpm -share/gnome/pixmaps/gnome-cd/ffwd.xpm -share/gnome/pixmaps/gnome-cd/goto.xpm share/gnome/pixmaps/gnome-cd/media-eject.png -share/gnome/pixmaps/gnome-cd/media-fwd.png +share/gnome/pixmaps/gnome-cd/media-ffwd.png share/gnome/pixmaps/gnome-cd/media-next.png share/gnome/pixmaps/gnome-cd/media-pause.png share/gnome/pixmaps/gnome-cd/media-play.png share/gnome/pixmaps/gnome-cd/media-prev.png -share/gnome/pixmaps/gnome-cd/media-rec.png -share/gnome/pixmaps/gnome-cd/media-rew.png +share/gnome/pixmaps/gnome-cd/media-record.png +share/gnome/pixmaps/gnome-cd/media-rewind.png share/gnome/pixmaps/gnome-cd/media-stop.png -share/gnome/pixmaps/gnome-cd/mixer.png -share/gnome/pixmaps/gnome-cd/next.xpm share/gnome/pixmaps/gnome-cd/once.png -share/gnome/pixmaps/gnome-cd/pause.xpm -share/gnome/pixmaps/gnome-cd/play.xpm share/gnome/pixmaps/gnome-cd/repeat.png -share/gnome/pixmaps/gnome-cd/rewind.xpm -share/gnome/pixmaps/gnome-cd/stop.xpm -share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-eject.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-first.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-fwd.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-last.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-pause.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-play.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/themes/lcd/a-stop.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png @@ -131,22 +95,9 @@ share/gnome/pixmaps/gnome-cd/themes/lcd/middle.png share/gnome/pixmaps/gnome-cd/themes/lcd/top-left.png share/gnome/pixmaps/gnome-cd/themes/lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/lcd/top.png -share/gnome/pixmaps/gnome-cd/themes/media/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/media/a-stop-menu.png share/gnome/pixmaps/gnome-cd/themes/media/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/media/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/media/bottom.png -share/gnome/pixmaps/gnome-cd/themes/media/media-eject.png -share/gnome/pixmaps/gnome-cd/themes/media/media-fwd.png -share/gnome/pixmaps/gnome-cd/themes/media/media-next.png -share/gnome/pixmaps/gnome-cd/themes/media/media-pause.png -share/gnome/pixmaps/gnome-cd/themes/media/media-play.png -share/gnome/pixmaps/gnome-cd/themes/media/media-prev.png -share/gnome/pixmaps/gnome-cd/themes/media/media-rew.png -share/gnome/pixmaps/gnome-cd/themes/media/media-stop.png share/gnome/pixmaps/gnome-cd/themes/media/media.theme share/gnome/pixmaps/gnome-cd/themes/media/middle-left.png share/gnome/pixmaps/gnome-cd/themes/media/middle-right.png @@ -154,19 +105,6 @@ share/gnome/pixmaps/gnome-cd/themes/media/middle.png share/gnome/pixmaps/gnome-cd/themes/media/top-left.png share/gnome/pixmaps/gnome-cd/themes/media/top-right.png share/gnome/pixmaps/gnome-cd/themes/media/top.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-eject.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-first.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-fwd.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-last.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-pause.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-play.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-rwnd.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop-menu.png -share/gnome/pixmaps/gnome-cd/themes/red-lcd/a-stop.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-left.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/bottom.png @@ -178,7 +116,6 @@ share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-left.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top-right.png share/gnome/pixmaps/gnome-cd/themes/red-lcd/top.png share/gnome/pixmaps/gnome-cd/track.png -share/gnome/pixmaps/gnome-cd/volume.xpm share/gnome/pixmaps/gnome-grecord.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-play.png share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-rec.png @@ -186,6 +123,7 @@ share/gnome/pixmaps/gnome-media/gnome-sound-recorder/media-stop.png share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-reclevel.png share/gnome/pixmaps/gnome-vumeter.png +share/gnome/pixmaps/gstreamer-properties.png share/locale/am/LC_MESSAGES/gnome-media-2.0.mo share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo share/locale/az/LC_MESSAGES/gnome-media-2.0.mo @@ -204,12 +142,15 @@ share/locale/fi/LC_MESSAGES/gnome-media-2.0.mo share/locale/fr/LC_MESSAGES/gnome-media-2.0.mo share/locale/ga/LC_MESSAGES/gnome-media-2.0.mo share/locale/gl/LC_MESSAGES/gnome-media-2.0.mo +share/locale/he/LC_MESSAGES/gnome-media-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-media-2.0.mo share/locale/hu/LC_MESSAGES/gnome-media-2.0.mo share/locale/it/LC_MESSAGES/gnome-media-2.0.mo share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo share/locale/nl/LC_MESSAGES/gnome-media-2.0.mo share/locale/nn/LC_MESSAGES/gnome-media-2.0.mo @@ -221,6 +162,7 @@ share/locale/ro/LC_MESSAGES/gnome-media-2.0.mo share/locale/ru/LC_MESSAGES/gnome-media-2.0.mo share/locale/sk/LC_MESSAGES/gnome-media-2.0.mo share/locale/sl/LC_MESSAGES/gnome-media-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-media-2.0.mo share/locale/sv/LC_MESSAGES/gnome-media-2.0.mo share/locale/tr/LC_MESSAGES/gnome-media-2.0.mo share/locale/uk/LC_MESSAGES/gnome-media-2.0.mo @@ -235,20 +177,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo @dirrm share/gnome/pixmaps/gnome-cd/themes/lcd @dirrm share/gnome/pixmaps/gnome-cd/themes @dirrm share/gnome/pixmaps/gnome-cd -@dirrm share/gnome/help/grecord/C/figures -@dirrm share/gnome/help/grecord/C -@dirrm share/gnome/help/grecord +@dirrm share/gnome/gnome-sound-recorder/ui +@dirrm share/gnome/gnome-sound-recorder @dirrm share/gnome/help/gnome-volume-control/C/figures @dirrm share/gnome/help/gnome-volume-control/C @dirrm share/gnome/help/gnome-volume-control +@dirrm share/gnome/help/gnome-sound-recorder/C/figures +@dirrm share/gnome/help/gnome-sound-recorder/C +@dirrm share/gnome/help/gnome-sound-recorder @dirrm share/gnome/help/gnome-cd/C/figures @dirrm share/gnome/help/gnome-cd/C @dirrm share/gnome/help/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-volume-control +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder/system-state @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-sound-recorder @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd @dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 3164c06d05b4..a0144e7dacd1 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.10 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ - glib-2.0.0:${PORTSDIR}/devel/glib20 \ + glib-2.0.200:${PORTSDIR}/devel/glib20 \ xslt.1:${PORTSDIR}/textproc/libxslt \ popt.0:${PORTSDIR}/devel/popt RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper @@ -29,18 +29,20 @@ USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier INSTALLS_SHLIB= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gda-config-tool.1 +MAN5= gda-config.5 .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB= MYSQL="" .else +CONFIGURE_ARGS+= --without-mysql PLIST_SUB= MYSQL="@comment " .endif @@ -50,9 +52,19 @@ LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} PLIST_SUB+= POSTGRES="" .else +CONFIGURE_ARGS+= --without-postgres PLIST_SUB+= POSTGRES="@comment " .endif +.if defined(WITH_LDAP) +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap2 +CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} +PLIST_SUB+= LDAP="" +.else +CONFIGURE_ARGS+= --without-ldap +PLIST_SUB+= LDAP="@comment " +.endif + pre-extract: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." @@ -60,6 +72,9 @@ pre-extract: .if !defined(WITH_POSTGRES) @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES." .endif +.if !defined(WITH_LDAP) + @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." +.endif post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo index 333320e20848..94e335653dde 100644 --- a/databases/libgda2/distinfo +++ b/databases/libgda2/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgda-0.9.0.tar.bz2) = 2d6599ba594b359a286f8f05c791b702 +MD5 (gnome2/libgda-0.10.0.tar.bz2) = 7d8ab6091d7a90e4b92fe6d123e6ae88 diff --git a/databases/libgda2/files/patch-aa b/databases/libgda2/files/patch-aa index 94f70db4275c..a090fe088157 100644 --- a/databases/libgda2/files/patch-aa +++ b/databases/libgda2/files/patch-aa @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Jul 26 16:09:57 2002 -+++ Makefile.in Fri Jul 26 16:10:46 2002 -@@ -155,7 +155,7 @@ +--- Makefile.in.orig Thu Feb 6 23:01:24 2003 ++++ Makefile.in Thu Feb 6 23:01:54 2003 +@@ -164,7 +164,7 @@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ --SUBDIRS = po idl libsql libgda providers report tools testing data doc -+SUBDIRS = po idl libsql libgda providers report tools data doc +-SUBDIRS = po libsql libgda providers report tools testing data doc ++SUBDIRS = po libsql libgda providers report tools data doc - EXTRA_DIST = COPYING libgda.spec.in libgda.pc.in intltool-extract.in intltool-merge.in intltool-update.in + EXTRA_DIST = COPYING libgda.spec intltool-extract.in intltool-merge.in intltool-update.in diff --git a/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh index 91713d2306f8..1c2fba5d533f 100644 --- a/x11-toolkits/libgnomeprintui/files/patch-ltmain.sh +++ b/databases/libgda2/files/patch-ltmain.sh @@ -1,18 +1,15 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Wed Jan 23 11:38:40 2002 -+++ ltmain.sh Sun Feb 3 01:44:17 2002 -@@ -1037,8 +1037,16 @@ +--- ltmain.sh.orig Fri Sep 13 15:38:11 2002 ++++ ltmain.sh Fri Oct 11 01:44:24 2002 +@@ -1073,8 +1073,16 @@ continue ;; + -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; + -module) module=yes @@ -20,17 +17,17 @@ $FreeBSD$ continue ;; -@@ -2412,6 +2420,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. +@@ -2502,6 +2510,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. ;; + *-*-freebsd*) + # FreeBSD doesn't need this... + ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4179,10 +4190,12 @@ + if test $build_libtool_need_lc = "yes"; then +@@ -4286,10 +4297,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index 863d4591116f..8882e5c2312a 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -1,8 +1,20 @@ bin/gda-config-tool +bin/gda-report-test bin/gda-run etc/libgda/config include/libgda-report/gda-report-document.h +include/libgda-report/gda-report-item-detail.h +include/libgda-report/gda-report-item-label.h +include/libgda-report/gda-report-item-pagefooter.h +include/libgda-report/gda-report-item-pageheader.h +include/libgda-report/gda-report-item-repfield.h +include/libgda-report/gda-report-item-report.h +include/libgda-report/gda-report-item-reportfooter.h +include/libgda-report/gda-report-item-reportheader.h +include/libgda-report/gda-report-item-sqlquery.h +include/libgda-report/gda-report-item.h include/libgda-report/gda-report-types.h +include/libgda-report/gda-report-valid.h include/libgda-report/gda-report.h include/libgda/gda-client.h include/libgda/gda-command.h @@ -61,10 +73,14 @@ lib/libgdasql.a lib/libgdasql.so lib/libgdasql.so.0 lib/libgda/providers/libgda-default.so +%%LDAP%%lib/libgda/providers/libgda-ldap.so %%MYSQL%%lib/libgda/providers/libgda-mysql.so %%POSTGRES%%lib/libgda/providers/libgda-postgres.so libdata/pkgconfig/libgda.pc share/doc/libgda/architecture.html +share/doc/libgda/c680.html +share/doc/libgda/c685.html +share/doc/libgda/c687.html share/doc/libgda/c689.html share/doc/libgda/compiling.html share/doc/libgda/connecting.html @@ -150,11 +166,18 @@ share/doc/libgda/migration-configuration.html share/doc/libgda/migration-executing-commands.html share/doc/libgda/migration.html share/doc/libgda/processing-queries.html +share/doc/libgda/x849.html +share/doc/libgda/x851.html share/doc/libgda/x853.html +share/doc/libgda/x878.html +share/doc/libgda/x880.html share/doc/libgda/x882.html +share/doc/libgda/x883.html +share/doc/libgda/x885.html share/doc/libgda/x887.html -share/gnome/idl/libgda/GNOME_Database.idl -share/gnome/libgda/dtd/gda-report.dtd +share/gnome/libgda/xml/gda-report.dtd +share/gnome/libgda/xml/gda-xml-query.dtd +share/gnome/libgda/xml/gda-xml-query.xsl share/gnome/omf/libgda/libgda-C.omf share/locale/az/LC_MESSAGES/libgda-2.mo share/locale/ca/LC_MESSAGES/libgda-2.mo @@ -186,9 +209,8 @@ share/locale/uk/LC_MESSAGES/libgda-2.mo share/locale/vi/LC_MESSAGES/libgda-2.mo share/locale/zh_CN/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/omf/libgda -@dirrm share/gnome/libgda/dtd +@dirrm share/gnome/libgda/xml @dirrm share/gnome/libgda -@dirrm share/gnome/idl/libgda @dirrm lib/libgda/providers @dirrm lib/libgda @dirrm include/libgda/sql diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 3164c06d05b4..a0144e7dacd1 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/0.10 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ - glib-2.0.0:${PORTSDIR}/devel/glib20 \ + glib-2.0.200:${PORTSDIR}/devel/glib20 \ xslt.1:${PORTSDIR}/textproc/libxslt \ popt.0:${PORTSDIR}/devel/popt RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper @@ -29,18 +29,20 @@ USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier INSTALLS_SHLIB= yes -USE_LIBTOOL= yes +GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl -lgdbm" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= gda-config-tool.1 +MAN5= gda-config.5 .if defined(WITH_MYSQL) LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} PLIST_SUB= MYSQL="" .else +CONFIGURE_ARGS+= --without-mysql PLIST_SUB= MYSQL="@comment " .endif @@ -50,9 +52,19 @@ LIB_DEPENDS+= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} PLIST_SUB+= POSTGRES="" .else +CONFIGURE_ARGS+= --without-postgres PLIST_SUB+= POSTGRES="@comment " .endif +.if defined(WITH_LDAP) +LIB_DEPENDS+= ldap.2:${PORTSDIR}/net/openldap2 +CONFIGURE_ARGS+= --with-ldap=${LOCALBASE} +PLIST_SUB+= LDAP="" +.else +CONFIGURE_ARGS+= --without-ldap +PLIST_SUB+= LDAP="@comment " +.endif + pre-extract: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." @@ -60,6 +72,9 @@ pre-extract: .if !defined(WITH_POSTGRES) @${ECHO_MSG} "You can enable support for Postgres databases by defining WITH_POSTGRES." .endif +.if !defined(WITH_LDAP) + @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." +.endif post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo index 333320e20848..94e335653dde 100644 --- a/databases/libgda3/distinfo +++ b/databases/libgda3/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgda-0.9.0.tar.bz2) = 2d6599ba594b359a286f8f05c791b702 +MD5 (gnome2/libgda-0.10.0.tar.bz2) = 7d8ab6091d7a90e4b92fe6d123e6ae88 diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa index 94f70db4275c..a090fe088157 100644 --- a/databases/libgda3/files/patch-aa +++ b/databases/libgda3/files/patch-aa @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Jul 26 16:09:57 2002 -+++ Makefile.in Fri Jul 26 16:10:46 2002 -@@ -155,7 +155,7 @@ +--- Makefile.in.orig Thu Feb 6 23:01:24 2003 ++++ Makefile.in Thu Feb 6 23:01:54 2003 +@@ -164,7 +164,7 @@ YACC = @YACC@ cxxflags_set = @cxxflags_set@ --SUBDIRS = po idl libsql libgda providers report tools testing data doc -+SUBDIRS = po idl libsql libgda providers report tools data doc +-SUBDIRS = po libsql libgda providers report tools testing data doc ++SUBDIRS = po libsql libgda providers report tools data doc - EXTRA_DIST = COPYING libgda.spec.in libgda.pc.in intltool-extract.in intltool-merge.in intltool-update.in + EXTRA_DIST = COPYING libgda.spec intltool-extract.in intltool-merge.in intltool-update.in diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh new file mode 100644 index 000000000000..1c2fba5d533f --- /dev/null +++ b/databases/libgda3/files/patch-ltmain.sh @@ -0,0 +1,42 @@ +--- ltmain.sh.orig Fri Sep 13 15:38:11 2002 ++++ ltmain.sh Fri Oct 11 01:44:24 2002 +@@ -1073,8 +1073,16 @@ + continue + ;; + ++ -pthread) ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; ++ + -module) + module=yes ++ build_old_libs=no + continue + ;; + +@@ -2502,6 +2510,9 @@ + *-*-openbsd*) + # Do not include libc due to us having libc/libc_r. + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + # Add libc to deplibs on all other systems if necessary. + if test $build_libtool_need_lc = "yes"; then +@@ -4286,10 +4297,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist index 863d4591116f..8882e5c2312a 100644 --- a/databases/libgda3/pkg-plist +++ b/databases/libgda3/pkg-plist @@ -1,8 +1,20 @@ bin/gda-config-tool +bin/gda-report-test bin/gda-run etc/libgda/config include/libgda-report/gda-report-document.h +include/libgda-report/gda-report-item-detail.h +include/libgda-report/gda-report-item-label.h +include/libgda-report/gda-report-item-pagefooter.h +include/libgda-report/gda-report-item-pageheader.h +include/libgda-report/gda-report-item-repfield.h +include/libgda-report/gda-report-item-report.h +include/libgda-report/gda-report-item-reportfooter.h +include/libgda-report/gda-report-item-reportheader.h +include/libgda-report/gda-report-item-sqlquery.h +include/libgda-report/gda-report-item.h include/libgda-report/gda-report-types.h +include/libgda-report/gda-report-valid.h include/libgda-report/gda-report.h include/libgda/gda-client.h include/libgda/gda-command.h @@ -61,10 +73,14 @@ lib/libgdasql.a lib/libgdasql.so lib/libgdasql.so.0 lib/libgda/providers/libgda-default.so +%%LDAP%%lib/libgda/providers/libgda-ldap.so %%MYSQL%%lib/libgda/providers/libgda-mysql.so %%POSTGRES%%lib/libgda/providers/libgda-postgres.so libdata/pkgconfig/libgda.pc share/doc/libgda/architecture.html +share/doc/libgda/c680.html +share/doc/libgda/c685.html +share/doc/libgda/c687.html share/doc/libgda/c689.html share/doc/libgda/compiling.html share/doc/libgda/connecting.html @@ -150,11 +166,18 @@ share/doc/libgda/migration-configuration.html share/doc/libgda/migration-executing-commands.html share/doc/libgda/migration.html share/doc/libgda/processing-queries.html +share/doc/libgda/x849.html +share/doc/libgda/x851.html share/doc/libgda/x853.html +share/doc/libgda/x878.html +share/doc/libgda/x880.html share/doc/libgda/x882.html +share/doc/libgda/x883.html +share/doc/libgda/x885.html share/doc/libgda/x887.html -share/gnome/idl/libgda/GNOME_Database.idl -share/gnome/libgda/dtd/gda-report.dtd +share/gnome/libgda/xml/gda-report.dtd +share/gnome/libgda/xml/gda-xml-query.dtd +share/gnome/libgda/xml/gda-xml-query.xsl share/gnome/omf/libgda/libgda-C.omf share/locale/az/LC_MESSAGES/libgda-2.mo share/locale/ca/LC_MESSAGES/libgda-2.mo @@ -186,9 +209,8 @@ share/locale/uk/LC_MESSAGES/libgda-2.mo share/locale/vi/LC_MESSAGES/libgda-2.mo share/locale/zh_CN/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/omf/libgda -@dirrm share/gnome/libgda/dtd +@dirrm share/gnome/libgda/xml @dirrm share/gnome/libgda -@dirrm share/gnome/idl/libgda @dirrm lib/libgda/providers @dirrm lib/libgda @dirrm include/libgda/sql diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 4f1988b55c97..e3fab7b08545 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -6,15 +6,15 @@ # PORTNAME= libgnomedb -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/libgnomedb/0.9 +MASTER_SITE_SUBDIR= sources/libgnomedb/0.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ gda-2.1:${PORTSDIR}/databases/libgda2 USE_BZIP2= yes diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index 3f2c29df78cc..25a2e6ac8202 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomedb-0.9.0.tar.bz2) = 1bd321a1c15a0922c9efc87742e9c081 +MD5 (gnome2/libgnomedb-0.10.0.tar.bz2) = edbc2fdc604694f8bd43b479f8805b91 diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist index fb7467eb6bc5..2885fd5a4a79 100644 --- a/databases/libgnomedb/pkg-plist +++ b/databases/libgnomedb/pkg-plist @@ -1,9 +1,9 @@ bin/gnome-database-properties etc/gconf/gconf.xml.defaults/apps/gnome-db/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/gnome-db/Shell/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-db/Editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome-db/UI/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Shell/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI/%gconf.xml etc/gconf/schemas/libgnomedb.schemas etc/gnome-vfs-2.0/modules/database-module.conf @@ -17,18 +17,19 @@ include/libgnomedb/gnome-db-control.h include/libgnomedb/gnome-db-data-source-selector.h include/libgnomedb/gnome-db-dsn-config-druid.h include/libgnomedb/gnome-db-dsn-config.h +include/libgnomedb/gnome-db-editor.h include/libgnomedb/gnome-db-error-dialog.h include/libgnomedb/gnome-db-error.h include/libgnomedb/gnome-db-form.h include/libgnomedb/gnome-db-gray-bar.h include/libgnomedb/gnome-db-grid.h +include/libgnomedb/gnome-db-icon-list.h include/libgnomedb/gnome-db-list.h include/libgnomedb/gnome-db-login-dialog.h include/libgnomedb/gnome-db-login.h include/libgnomedb/gnome-db-model.h include/libgnomedb/gnome-db-provider-selector.h include/libgnomedb/gnome-db-report-editor.h -include/libgnomedb/gnome-db-sql-editor.h include/libgnomedb/gnome-db-stock.h include/libgnomedb/gnome-db-table-editor.h include/libgnomedb/gnome-db-util.h @@ -73,11 +74,13 @@ share/doc/libgnomedb/libgnomedb-gnomedbcontrolwidget.html share/doc/libgnomedb/libgnomedb-gnomedbdatasourceselector.html share/doc/libgnomedb/libgnomedb-gnomedbdsnconfig.html share/doc/libgnomedb/libgnomedb-gnomedbdsnconfigdruid.html +share/doc/libgnomedb/libgnomedb-gnomedbeditor.html share/doc/libgnomedb/libgnomedb-gnomedberror.html share/doc/libgnomedb/libgnomedb-gnomedberrordialog.html share/doc/libgnomedb/libgnomedb-gnomedbform.html share/doc/libgnomedb/libgnomedb-gnomedbgraybar.html share/doc/libgnomedb/libgnomedb-gnomedbgrid.html +share/doc/libgnomedb/libgnomedb-gnomedbiconlist.html share/doc/libgnomedb/libgnomedb-gnomedblist.html share/doc/libgnomedb/libgnomedb-gnomedblogin.html share/doc/libgnomedb/libgnomedb-gnomedblogindialog.html @@ -101,6 +104,7 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-designer_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-disconnect_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-indexes_16x16.png +share/gnome/pixmaps/libgnomedb/gnome-db-no-transaction_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png @@ -116,6 +120,7 @@ share/gnome/pixmaps/libgnomedb/gnome-db-triggers_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-types_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-types_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-views_16x16.png +share/gnome/pixmaps/libgnomedb/gnome-db-within-transaction_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db.png share/locale/az/LC_MESSAGES/libgnomedb-2.mo share/locale/be/LC_MESSAGES/libgnomedb-2.mo @@ -154,8 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo @dirrm share/doc/libgnomedb @dirrm include/libgnomedb @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/UI -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Shell +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db/Editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-db @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/UI -@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/Shell +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db/Editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-db diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index eb188df43d13..ac31ed4041af 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -6,16 +6,16 @@ # PORTNAME= mergeant -PORTVERSION= 0.9.0 +PORTVERSION= 0.10.0 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \ - gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui + gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index dd339327b3d9..f65e8c1f64af 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1 +1 @@ -MD5 (gnome2/mergeant-0.9.0.tar.bz2) = 4f821d296ac4d53ca7111242b70455ab +MD5 (gnome2/mergeant-0.10.0.tar.bz2) = 2e8b98332288d07a5e1cbdfd0a828f2f diff --git a/databases/mergeant/files/patch-configure b/databases/mergeant/files/patch-configure index d718517b75ab..522cb695567f 100644 --- a/databases/mergeant/files/patch-configure +++ b/databases/mergeant/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Sep 9 17:46:33 2002 -+++ configure Sun Sep 15 02:43:36 2002 -@@ -7596,6 +7596,7 @@ +--- configure.orig Mon Jan 27 20:50:17 2003 ++++ configure Fri Feb 7 01:02:04 2003 +@@ -7948,6 +7948,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10065,13 +10066,13 @@ +@@ -9405,13 +9406,13 @@ MERGEANT_Pixmapdir=${datadir}/pixmaps/${PACKAGE} @@ -19,8 +19,8 @@ MERGEANT_Plugdir=${datadir}/${PACKAGE}/plugins --MERGEANT_Helpdir=${datadir}/doc/${PACKAGE} -+MERGEANT_Helpdir=${prefix}/share/doc/${PACKAGE} +-MERGEANT_Helpdir=${datadir}/gnome/help/${PACKAGE} ++MERGEANT_Helpdir=${datadir}/help/${PACKAGE} diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist index ac52b84072cd..dea19a0e9515 100644 --- a/databases/mergeant/pkg-plist +++ b/databases/mergeant/pkg-plist @@ -1,12 +1,16 @@ bin/mergeant -share/doc/mergeant/C/topic.dat +share/gnome/application-registry/mergeant.applications share/gnome/applications/mergeant.desktop +share/gnome/help/mergeant/C/topic.dat share/gnome/mergeant/dtd/mergeant.dtd share/gnome/mergeant/plugins/libPnetaddr.so share/gnome/mergeant/plugins/libPpicts.so share/gnome/mergeant/plugins/libPsample.so +share/gnome/mime-info/mergeant.keys +share/gnome/mime-info/mergeant.mime share/gnome/omf/mergeant/mergeant-C.omf @exec scrollkeeper-install -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true +share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png share/gnome/pixmaps/mergeant/mergeant.png share/gnome/pixmaps/mergeant/mergeant_connect.png share/gnome/pixmaps/mergeant/mergeant_connect_small.png @@ -19,6 +23,9 @@ share/gnome/pixmaps/mergeant/mergeant_rels.png share/gnome/pixmaps/mergeant/mergeant_rels_small.png share/gnome/pixmaps/mergeant/mergeant_sequences.png share/gnome/pixmaps/mergeant/mergeant_tables.png +share/gnome/pixmaps/mergeant/query-view-query_16x16.png +share/gnome/pixmaps/mergeant/query-view-table_16x16.png +share/gnome/pixmaps/mergeant/query-view-view_16x16.png share/locale/cs/LC_MESSAGES/mergeant.mo share/locale/da/LC_MESSAGES/mergeant.mo share/locale/de/LC_MESSAGES/mergeant.mo @@ -26,6 +33,8 @@ share/locale/es/LC_MESSAGES/mergeant.mo share/locale/fr/LC_MESSAGES/mergeant.mo share/locale/it/LC_MESSAGES/mergeant.mo share/locale/ms/LC_MESSAGES/mergeant.mo +share/locale/nl/LC_MESSAGES/mergeant.mo +share/locale/no/LC_MESSAGES/mergeant.mo share/locale/pl/LC_MESSAGES/mergeant.mo share/locale/pt_BR/LC_MESSAGES/mergeant.mo share/locale/ru/LC_MESSAGES/mergeant.mo @@ -38,8 +47,8 @@ share/locale/vi/LC_MESSAGES/mergeant.mo @dirrm share/gnome/mergeant/plugins @dirrm share/gnome/mergeant/dtd @dirrm share/gnome/mergeant -@dirrm share/doc/mergeant/C/stylesheet-images -@dirrm share/doc/mergeant/C/images -@dirrm share/doc/mergeant/C -@dirrm share/doc/mergeant +@dirrm share/gnome/help/mergeant/C/stylesheet-images +@dirrm share/gnome/help/mergeant/C/images +@dirrm share/gnome/help/mergeant/C +@dirrm share/gnome/help/mergeant @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/mergeant/mergeant-C.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 3a7c61b84520..94b107947b2e 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.0.7 +PORTVERSION= 2.2.0.3 PORTEPOCH= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.0 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.2 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,9 +29,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -MAN1= archive-generator.1 gnome-calculator.1 \ +MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ - gnome-search-tool.1 gnome-system-log.1 + gnome-search-tool.1 gnome-system-log.1 gdialog.1 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index faead41ee708..c03547bae072 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-2.0.7.tar.bz2) = 84751dc1ccf07c1dd19746404f7dee88 +MD5 (gnome2/gnome-utils-2.2.0.3.tar.bz2) = cef6a3be39d160cf5e2a371293044f7f diff --git a/deskutils/gnome-utils/files/patch-configure b/deskutils/gnome-utils/files/patch-configure index f562f261364b..d5d7d0e103f2 100644 --- a/deskutils/gnome-utils/files/patch-configure +++ b/deskutils/gnome-utils/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 13 06:31:59 2003 -+++ configure Mon Jan 13 19:40:06 2003 -@@ -10323,7 +10323,7 @@ +--- configure.orig Mon Nov 25 09:25:29 2002 ++++ configure Tue Nov 26 16:04:42 2002 +@@ -10347,7 +10347,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 3a44db63e89f..9172619a8a13 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -1,15 +1,17 @@ -bin/archive-generator +bin/gdialog bin/gnome-calculator bin/gnome-character-map bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml +etc/gconf/schemas/logview.schemas etc/gconf/schemas/gdict.schemas libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet -share/gnome/applications/archive-generator.desktop share/gnome/applications/gnome-calculator.desktop share/gnome/applications/gnome-character-map.desktop share/gnome/applications/gnome-dictionary.desktop @@ -19,43 +21,42 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml share/gnome/gnome-system-log/gnome-system-log-actions.db share/gnome/gnome-system-log/gnome-system-log-descript.db share/gnome/gnome-system-log/gnome-system-log-regexp.db -share/gnome/help/archive-generator/C/archive-generator.xml -share/gnome/help/archive-generator/C/figures/archive-generator-contents.png -share/gnome/help/archive-generator/C/figures/archive-generator.png -share/gnome/help/archive-generator/C/legal.xml +share/gnome/help/gdialog/C/figures/example-dialog.png +share/gnome/help/gdialog/C/figures/gdialog-msgbox.png +share/gnome/help/gdialog/C/figures/gdialog-yesno.png +share/gnome/help/gdialog/C/gdialog.xml +share/gnome/help/gdialog/C/legal.xml share/gnome/help/gnome-calculator/C/figures/gcalc_window.png share/gnome/help/gnome-calculator/C/gnome-calculator.xml share/gnome/help/gnome-calculator/C/legal.xml share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png share/gnome/help/gnome-character-map/C/gnome-character-map.xml share/gnome/help/gnome-character-map/C/legal.xml -share/gnome/help/gnome-dictionary/C/figures/gdict-find.png -share/gnome/help/gnome-dictionary/C/figures/gdict-main.png -share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png -share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png -share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png share/gnome/help/gnome-dictionary/C/figures/gdict_window.png share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml share/gnome/help/gnome-dictionary/C/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml share/gnome/help/gnome-system-log/C/figures/syslog_window.png share/gnome/help/gnome-system-log/C/gnome-system-log.xml share/gnome/help/gnome-system-log/C/legal.xml -share/gnome/omf/gnome-utils/archive-generator-C.omf +share/gnome/omf/gnome-utils/gdialog-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-calculator-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-character-map-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-system-log-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-character-map.png share/gnome/pixmaps/gnome-searchtool.png -share/gnome/pixmaps/gnome-system-log/logview.xpm share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo @@ -74,12 +75,15 @@ share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo @@ -115,9 +119,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-calculator/C/figures @dirrm share/gnome/help/gnome-calculator/C @dirrm share/gnome/help/gnome-calculator -@dirrm share/gnome/help/archive-generator/C/figures -@dirrm share/gnome/help/archive-generator/C -@dirrm share/gnome/help/archive-generator +@dirrm share/gnome/help/gdialog/C/figures +@dirrm share/gnome/help/gdialog/C @dirrm share/gnome/gnome-system-log @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 3a7c61b84520..94b107947b2e 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.0.7 +PORTVERSION= 2.2.0.3 PORTEPOCH= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.0 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.2 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,9 +29,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -MAN1= archive-generator.1 gnome-calculator.1 \ +MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ - gnome-search-tool.1 gnome-system-log.1 + gnome-search-tool.1 gnome-system-log.1 gdialog.1 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index faead41ee708..c03547bae072 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-2.0.7.tar.bz2) = 84751dc1ccf07c1dd19746404f7dee88 +MD5 (gnome2/gnome-utils-2.2.0.3.tar.bz2) = cef6a3be39d160cf5e2a371293044f7f diff --git a/deskutils/gnomeutils2/files/patch-configure b/deskutils/gnomeutils2/files/patch-configure index f562f261364b..d5d7d0e103f2 100644 --- a/deskutils/gnomeutils2/files/patch-configure +++ b/deskutils/gnomeutils2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 13 06:31:59 2003 -+++ configure Mon Jan 13 19:40:06 2003 -@@ -10323,7 +10323,7 @@ +--- configure.orig Mon Nov 25 09:25:29 2002 ++++ configure Tue Nov 26 16:04:42 2002 +@@ -10347,7 +10347,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index 3a44db63e89f..9172619a8a13 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -1,15 +1,17 @@ -bin/archive-generator +bin/gdialog bin/gnome-calculator bin/gnome-character-map bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml +etc/gconf/schemas/logview.schemas etc/gconf/schemas/gdict.schemas libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet -share/gnome/applications/archive-generator.desktop share/gnome/applications/gnome-calculator.desktop share/gnome/applications/gnome-character-map.desktop share/gnome/applications/gnome-dictionary.desktop @@ -19,43 +21,42 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml share/gnome/gnome-system-log/gnome-system-log-actions.db share/gnome/gnome-system-log/gnome-system-log-descript.db share/gnome/gnome-system-log/gnome-system-log-regexp.db -share/gnome/help/archive-generator/C/archive-generator.xml -share/gnome/help/archive-generator/C/figures/archive-generator-contents.png -share/gnome/help/archive-generator/C/figures/archive-generator.png -share/gnome/help/archive-generator/C/legal.xml +share/gnome/help/gdialog/C/figures/example-dialog.png +share/gnome/help/gdialog/C/figures/gdialog-msgbox.png +share/gnome/help/gdialog/C/figures/gdialog-yesno.png +share/gnome/help/gdialog/C/gdialog.xml +share/gnome/help/gdialog/C/legal.xml share/gnome/help/gnome-calculator/C/figures/gcalc_window.png share/gnome/help/gnome-calculator/C/gnome-calculator.xml share/gnome/help/gnome-calculator/C/legal.xml share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png share/gnome/help/gnome-character-map/C/gnome-character-map.xml share/gnome/help/gnome-character-map/C/legal.xml -share/gnome/help/gnome-dictionary/C/figures/gdict-find.png -share/gnome/help/gnome-dictionary/C/figures/gdict-main.png -share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png -share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png -share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png share/gnome/help/gnome-dictionary/C/figures/gdict_window.png share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml share/gnome/help/gnome-dictionary/C/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml share/gnome/help/gnome-system-log/C/figures/syslog_window.png share/gnome/help/gnome-system-log/C/gnome-system-log.xml share/gnome/help/gnome-system-log/C/legal.xml -share/gnome/omf/gnome-utils/archive-generator-C.omf +share/gnome/omf/gnome-utils/gdialog-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-calculator-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-character-map-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-system-log-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-character-map.png share/gnome/pixmaps/gnome-searchtool.png -share/gnome/pixmaps/gnome-system-log/logview.xpm share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo @@ -74,12 +75,15 @@ share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo @@ -115,9 +119,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-calculator/C/figures @dirrm share/gnome/help/gnome-calculator/C @dirrm share/gnome/help/gnome-calculator -@dirrm share/gnome/help/archive-generator/C/figures -@dirrm share/gnome/help/archive-generator/C -@dirrm share/gnome/help/archive-generator +@dirrm share/gnome/help/gdialog/C/figures +@dirrm share/gnome/help/gdialog/C @dirrm share/gnome/gnome-system-log @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index f2d205dea3b1..5898a1a822cb 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ORBit2 -PORTVERSION= 2.4.4 +PORTVERSION= 2.6.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,12 +23,14 @@ USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ARGS= --disable-indent CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @find ${WRKSRC} -type f | xargs ${GREP} -l LINC_THREADSAFE | \ xargs ${REINPLACE_CMD} -e 's|LINC_THREADSAFE|G_THREADS_ENABLED|g' diff --git a/devel/ORBit2/distinfo b/devel/ORBit2/distinfo index 1e4f3cc849fb..7534e5224241 100644 --- a/devel/ORBit2/distinfo +++ b/devel/ORBit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ORBit2-2.4.4.tar.bz2) = e487accae11949d606938e2678191f05 +MD5 (gnome2/ORBit2-2.6.0.tar.bz2) = c0b26f13f63db89503234d9367962e23 diff --git a/devel/ORBit2/files/patch-ab b/devel/ORBit2/files/patch-ab index 6b72dbaeed3c..308fddd87618 100644 --- a/devel/ORBit2/files/patch-ab +++ b/devel/ORBit2/files/patch-ab @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- Makefile.in.orig Mon Jan 28 19:56:23 2002 -+++ Makefile.in Wed Feb 13 10:48:08 2002 +--- Makefile.in.orig Sat Oct 19 15:24:09 2002 ++++ Makefile.in Sat Oct 19 15:25:58 2002 @@ -35,7 +35,7 @@ DESTDIR = @@ -12,7 +9,7 @@ $FreeBSD$ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . -@@ -93,11 +93,10 @@ +@@ -97,11 +97,10 @@ STRIP = @STRIP@ VERSION = @VERSION@ WARN_CFLAGS = @WARN_CFLAGS@ @@ -25,12 +22,3 @@ $FreeBSD$ bin_SCRIPTS = orbit2-config -@@ -107,7 +106,7 @@ - m4datadir = $(datadir)/aclocal - m4data_DATA = ORBit2.m4 - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(pkglibdir) - pkgconfig_DATA = ORBit-2.0.pc ORBit-CosNaming-2.0.pc - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/devel/ORBit2/pkg-plist b/devel/ORBit2/pkg-plist index a58ff8822d71..5a806118bb68 100644 --- a/devel/ORBit2/pkg-plist +++ b/devel/ORBit2/pkg-plist @@ -5,6 +5,7 @@ etc/orbit2rc.default @exec if [ ! -f %D/etc/orbit2rc ] ; then cp -p %D/%F %B/orbit2rc; fi include/orbit-2.0/ORBitservices/CosNaming.h include/orbit-2.0/ORBitservices/CosNaming_impl.h +include/orbit-2.0/orbit-idl/orbit-idl-backend.h include/orbit-2.0/orbit/GIOP/giop-basics.h include/orbit-2.0/orbit/GIOP/giop-connection.h include/orbit-2.0/orbit/GIOP/giop-endian.h @@ -62,6 +63,7 @@ lib/libORBitCosNaming-2.so lib/libORBitCosNaming-2.so.0 lib/libname-server-2.a libdata/pkgconfig/ORBit-2.0.pc +libdata/pkgconfig/ORBit-idl-2.0.pc libdata/pkgconfig/ORBit-CosNaming-2.0.pc share/aclocal/ORBit2.m4 share/idl/orbit-2.0/CosNaming.idl @@ -73,5 +75,6 @@ share/idl/orbit-2.0/CosNaming.idl @dirrm include/orbit-2.0/orbit/dynamic @dirrm include/orbit-2.0/orbit/GIOP @dirrm include/orbit-2.0/orbit +@dirrm include/orbit-2.0/orbit-idl @dirrm include/orbit-2.0/ORBitservices @dirrm include/orbit-2.0 diff --git a/devel/atk/Makefile b/devel/atk/Makefile index 5b20ed3bce09..6ca7fa395a88 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -6,11 +6,11 @@ # PORTNAME= atk -PORTVERSION= 1.0.3 +PORTVERSION= 1.2.2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 #MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ # ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ # http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -20,19 +20,19 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static +USE_GNOMENG= yes +USE_GNOME= gnomehack +CONFIGURE_ARGS= --enable-static \ + --disable-gtk-doc \ + --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/atk/distinfo b/devel/atk/distinfo index e6cf774217f5..50cdc842bcf9 100644 --- a/devel/atk/distinfo +++ b/devel/atk/distinfo @@ -1 +1 @@ -MD5 (gnome2/atk-1.0.3.tar.bz2) = 9041396017f8207b8aa2bece27eb5ebb +MD5 (gnome2/atk-1.2.2.tar.bz2) = 2c42e4322d1a199cdd7479fb1d09879c diff --git a/devel/atk/files/patch-Makefile.in b/devel/atk/files/patch-Makefile.in index be30e08fdddc..90d6da723065 100644 --- a/devel/atk/files/patch-Makefile.in +++ b/devel/atk/files/patch-Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in.orig Wed Aug 1 20:32:06 2001 -+++ Makefile.in Wed Aug 1 20:33:45 2001 -@@ -96,7 +96,7 @@ - STRIP = @STRIP@ - VERSION = @VERSION@ +--- Makefile.in.orig Fri Nov 8 17:09:46 2002 ++++ Makefile.in Fri Nov 8 17:10:22 2002 +@@ -116,7 +116,7 @@ + atktargetlib = @atktargetlib@ + ms_librarian = @ms_librarian@ --SUBDIRS = atk tests docs -+SUBDIRS = atk +-SUBDIRS = atk tests docs po ++SUBDIRS = atk docs po - EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in + EXTRA_DIST = atk-uninstalled.pc.in atk.pc.in atk.spec.in atk.spec atk-zip.sh diff --git a/devel/atk/files/patch-docs_Makefile.in b/devel/atk/files/patch-docs_Makefile.in new file mode 100644 index 000000000000..b40046ee22c3 --- /dev/null +++ b/devel/atk/files/patch-docs_Makefile.in @@ -0,0 +1,10 @@ +--- docs/Makefile.in.orig Fri Jan 24 16:45:09 2003 ++++ docs/Makefile.in Fri Jan 24 16:45:09 2003 +@@ -274,6 +274,7 @@ + dist-hook-local: all-local + + @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp ++@ENABLE_GTK_DOC_FALSE@all-local: + + #### scan #### + diff --git a/devel/atk/pkg-plist b/devel/atk/pkg-plist index a657b8a6397a..43664cddbf4e 100644 --- a/devel/atk/pkg-plist +++ b/devel/atk/pkg-plist @@ -15,6 +15,7 @@ include/atk-1.0/atk/atkobjectfactory.h include/atk-1.0/atk/atkregistry.h include/atk-1.0/atk/atkrelation.h include/atk-1.0/atk/atkrelationset.h +include/atk-1.0/atk/atkrelationtype.h include/atk-1.0/atk/atkselection.h include/atk-1.0/atk/atkstate.h include/atk-1.0/atk/atkstateset.h @@ -25,7 +26,59 @@ include/atk-1.0/atk/atkutil.h include/atk-1.0/atk/atkvalue.h lib/libatk-1.0.a lib/libatk-1.0.so -lib/libatk-1.0.so.0 +lib/libatk-1.0.so.200 libdata/pkgconfig/atk.pc +share/doc/atk/atk-atkstate.html +share/doc/atk/atk.html +share/doc/atk/atkaction.html +share/doc/atk/atkcomponent.html +share/doc/atk/atkdocument.html +share/doc/atk/atkeditabletext.html +share/doc/atk/atkhypertext.html +share/doc/atk/atkimage.html +share/doc/atk/atkgobjectaccessible.html +share/doc/atk/atkhyperlink.html +share/doc/atk/atknoopobject.html +share/doc/atk/atknoopobjectfactory.html +share/doc/atk/atkobject.html +share/doc/atk/atkobjectfactory.html +share/doc/atk/atkregistry.html +share/doc/atk/atkrelation.html +share/doc/atk/atkrelationset.html +share/doc/atk/atkselection.html +share/doc/atk/atkstateset.html +share/doc/atk/atkstreamablecontent.html +share/doc/atk/atktable.html +share/doc/atk/atktext.html +share/doc/atk/atkutil.html +share/doc/atk/atkvalue.html +share/doc/atk/book1.html +share/doc/atk/index.sgml +share/locale/bg/LC_MESSAGES/atk10.mo +share/locale/ca/LC_MESSAGES/atk10.mo +share/locale/cs/LC_MESSAGES/atk10.mo +share/locale/da/LC_MESSAGES/atk10.mo +share/locale/de/LC_MESSAGES/atk10.mo +share/locale/el/LC_MESSAGES/atk10.mo +share/locale/en_GB/LC_MESSAGES/atk10.mo +share/locale/es/LC_MESSAGES/atk10.mo +share/locale/fi/LC_MESSAGES/atk10.mo +share/locale/fr/LC_MESSAGES/atk10.mo +share/locale/he/LC_MESSAGES/atk10.mo +share/locale/hu/LC_MESSAGES/atk10.mo +share/locale/it/LC_MESSAGES/atk10.mo +share/locale/ko/LC_MESSAGES/atk10.mo +share/locale/lv/LC_MESSAGES/atk10.mo +share/locale/ms/LC_MESSAGES/atk10.mo +share/locale/nl/LC_MESSAGES/atk10.mo +share/locale/no/LC_MESSAGES/atk10.mo +share/locale/pl/LC_MESSAGES/atk10.mo +share/locale/ru/LC_MESSAGES/atk10.mo +share/locale/sq/LC_MESSAGES/atk10.mo +share/locale/sv/LC_MESSAGES/atk10.mo +share/locale/uk/LC_MESSAGES/atk10.mo +share/locale/vi/LC_MESSAGES/atk10.mo +share/locale/zh_CN/LC_MESSAGES/atk10.mo +@dirrm share/doc/atk @dirrm include/atk-1.0/atk @dirrm include/atk-1.0 diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile index d8bcc040d8d7..c44edca6d5d9 100644 --- a/devel/bonobo-activation/Makefile +++ b/devel/bonobo-activation/Makefile @@ -6,12 +6,11 @@ # PORTNAME= bonobo-activation -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 2.2.1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/bonobo-activation/distinfo b/devel/bonobo-activation/distinfo index 12555f159da1..ef044191ded4 100644 --- a/devel/bonobo-activation/distinfo +++ b/devel/bonobo-activation/distinfo @@ -1 +1 @@ -MD5 (gnome2/bonobo-activation-1.0.4.tar.bz2) = 2b68d7a94d195cbcca15fcb63e55fb6a +MD5 (gnome2/bonobo-activation-2.2.1.tar.bz2) = bb7f6875eba86928c9ec072cf8c887da diff --git a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c index e3db3eedc374..db8d816a89d2 100644 --- a/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c +++ b/devel/bonobo-activation/files/patch-bonobo-activation::bonobo-activation-fork-server.c @@ -1,11 +1,11 @@ ---- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Nov 8 03:19:52 2002 -+++ bonobo-activation/bonobo-activation-fork-server.c Fri Nov 8 03:20:04 2002 -@@ -396,6 +396,8 @@ +--- bonobo-activation/bonobo-activation-fork-server.c.orig Fri Oct 18 06:15:11 2002 ++++ bonobo-activation/bonobo-activation-fork-server.c Sat Oct 19 15:35:03 2002 +@@ -364,6 +364,8 @@ } else if ((childpid = fork ())) { _exit (0); /* de-zombifier process, just exit */ } else { + sigprocmask (SIG_SETMASK, &omask, NULL); + - if (display) - bonobo_activation_setenv ("DISPLAY", display); - if (session_manager) + setenv_activation_environment (environment); + + if (od_iorstr != NULL) { diff --git a/devel/bonobo-activation/files/patch-server::Makefile.in b/devel/bonobo-activation/files/patch-server::Makefile.in index aad85b8a56c8..80acb58f6dd8 100644 --- a/devel/bonobo-activation/files/patch-server::Makefile.in +++ b/devel/bonobo-activation/files/patch-server::Makefile.in @@ -1,5 +1,5 @@ ---- server/Makefile.in.orig Fri Nov 8 03:18:57 2002 -+++ server/Makefile.in Fri Nov 8 03:19:22 2002 +--- server/Makefile.in.orig Sat Oct 19 15:35:36 2002 ++++ server/Makefile.in Sat Oct 19 15:37:02 2002 @@ -154,7 +154,7 @@ -I$(top_builddir) \ -I$(top_builddir)/bonobo-activation \ diff --git a/devel/bonobo-activation/files/patch-server::activation-server-main.c b/devel/bonobo-activation/files/patch-server::activation-server-main.c index a6c4e34fa107..56d3537786c3 100644 --- a/devel/bonobo-activation/files/patch-server::activation-server-main.c +++ b/devel/bonobo-activation/files/patch-server::activation-server-main.c @@ -1,6 +1,6 @@ ---- server/activation-server-main.c.orig Tue Oct 29 05:51:19 2002 -+++ server/activation-server-main.c Fri Nov 8 03:21:04 2002 -@@ -131,7 +131,7 @@ +--- server/activation-server-main.c.orig Fri Oct 18 06:15:12 2002 ++++ server/activation-server-main.c Sat Nov 9 01:50:36 2002 +@@ -127,7 +127,7 @@ g_string_append (gnome_od_source_dir, gnome_dirs[i]); g_string_append (gnome_od_source_dir, diff --git a/devel/bonobo-activation/pkg-plist b/devel/bonobo-activation/pkg-plist index b27389f39a2b..276125f438c8 100644 --- a/devel/bonobo-activation/pkg-plist +++ b/devel/bonobo-activation/pkg-plist @@ -26,61 +26,37 @@ libdata/bonobo/servers/plugin.server libdata/pkgconfig/bonobo-activation-2.0.pc libexec/bonobo-activation-server sbin/bonobo-activation-sysconf -share/doc/bonobo-activation/api-reference.html -share/doc/bonobo-activation/architecture.html -share/doc/bonobo-activation/async-activation.html -share/doc/bonobo-activation/attribute-tag.html -share/doc/bonobo-activation/bonobo-activation-debugging.html -share/doc/bonobo-activation/bonobo-activation-initialization.html -share/doc/bonobo-activation/bonobo-activation-query-and-activation.html -share/doc/bonobo-activation/bonobo-activation-registration.html -share/doc/bonobo-activation/bonobo-activation-utilities.html -share/doc/bonobo-activation/bonobo-activation.png -share/doc/bonobo-activation/checklist.html -share/doc/bonobo-activation/configuring.html -share/doc/bonobo-activation/fdl-section1.html -share/doc/bonobo-activation/fdl-section10.html -share/doc/bonobo-activation/fdl-section2.html -share/doc/bonobo-activation/fdl-section3.html -share/doc/bonobo-activation/fdl-section4.html -share/doc/bonobo-activation/fdl-section5.html -share/doc/bonobo-activation/fdl-section6.html -share/doc/bonobo-activation/fdl-section7.html -share/doc/bonobo-activation/fdl-section8.html -share/doc/bonobo-activation/fdl-section9.html -share/doc/bonobo-activation/fdl-using.html -share/doc/bonobo-activation/fdl.html -share/doc/bonobo-activation/index.html -share/doc/bonobo-activation/index.sgml -share/doc/bonobo-activation/migrating.html -share/doc/bonobo-activation/query-langage.html -share/doc/bonobo-activation/query-syntax.html -share/doc/bonobo-activation/server-arch.html -share/doc/bonobo-activation/server-xml-reference.html -share/doc/bonobo-activation/tutorial.html share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl +share/locale/am/LC_MESSAGES/bonobo-activation.mo share/locale/az/LC_MESSAGES/bonobo-activation.mo share/locale/ar/LC_MESSAGES/bonobo-activation.mo +share/locale/be/LC_MESSAGES/bonobo-activation.mo share/locale/bg/LC_MESSAGES/bonobo-activation.mo share/locale/ca/LC_MESSAGES/bonobo-activation.mo +share/locale/cs/LC_MESSAGES/bonobo-activation.mo share/locale/da/LC_MESSAGES/bonobo-activation.mo share/locale/de/LC_MESSAGES/bonobo-activation.mo share/locale/el/LC_MESSAGES/bonobo-activation.mo share/locale/es/LC_MESSAGES/bonobo-activation.mo +share/locale/fa/LC_MESSAGES/bonobo-activation.mo share/locale/fi/LC_MESSAGES/bonobo-activation.mo share/locale/fr/LC_MESSAGES/bonobo-activation.mo share/locale/ga/LC_MESSAGES/bonobo-activation.mo share/locale/gl/LC_MESSAGES/bonobo-activation.mo +share/locale/he/LC_MESSAGES/bonobo-activation.mo share/locale/hi/LC_MESSAGES/bonobo-activation.mo share/locale/hu/LC_MESSAGES/bonobo-activation.mo +share/locale/id/LC_MESSAGES/bonobo-activation.mo share/locale/it/LC_MESSAGES/bonobo-activation.mo share/locale/ja/LC_MESSAGES/bonobo-activation.mo share/locale/ko/LC_MESSAGES/bonobo-activation.mo share/locale/lv/LC_MESSAGES/bonobo-activation.mo +share/locale/mk/LC_MESSAGES/bonobo-activation.mo +share/locale/mn/LC_MESSAGES/bonobo-activation.mo share/locale/ms/LC_MESSAGES/bonobo-activation.mo share/locale/nl/LC_MESSAGES/bonobo-activation.mo share/locale/nn/LC_MESSAGES/bonobo-activation.mo @@ -92,15 +68,16 @@ share/locale/ro/LC_MESSAGES/bonobo-activation.mo share/locale/ru/LC_MESSAGES/bonobo-activation.mo share/locale/sk/LC_MESSAGES/bonobo-activation.mo share/locale/sl/LC_MESSAGES/bonobo-activation.mo +share/locale/sq/LC_MESSAGES/bonobo-activation.mo share/locale/sv/LC_MESSAGES/bonobo-activation.mo share/locale/ta/LC_MESSAGES/bonobo-activation.mo share/locale/tr/LC_MESSAGES/bonobo-activation.mo share/locale/uk/LC_MESSAGES/bonobo-activation.mo share/locale/vi/LC_MESSAGES/bonobo-activation.mo +share/locale/wa/LC_MESSAGES/bonobo-activation.mo share/locale/zh_CN/LC_MESSAGES/bonobo-activation.mo share/locale/zh_TW/LC_MESSAGES/bonobo-activation.mo @dirrm share/idl/bonobo-activation-2.0 -@dirrm share/doc/bonobo-activation @dirrm libdata/bonobo/servers @dirrm libdata/bonobo @dirrm include/bonobo-activation-2.0/bonobo-activation diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 5b71060c82cb..3c08f1d4d82a 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bugbuddy2 -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.102 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/bug-buddy/2.2 @@ -15,26 +15,23 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= bug-buddy.1 -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g' .include <bsd.port.mk> diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index 872361f759c0..c258a0ca130d 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1 +1 @@ -MD5 (gnome2/bug-buddy-2.2.0.tar.bz2) = c98a12f48a1f0c8697a7937a4a7d08a1 +MD5 (gnome2/bug-buddy-2.2.102.tar.bz2) = 154ecb6e924cf25aebf0610cc3e38be2 diff --git a/devel/bugbuddy2/pkg-plist b/devel/bugbuddy2/pkg-plist index d21dc8b68f19..7636bb7796c7 100644 --- a/devel/bugbuddy2/pkg-plist +++ b/devel/bugbuddy2/pkg-plist @@ -19,9 +19,12 @@ share/gnome/help/bug-buddy/C/legal.xml share/gnome/mime-info/bug-buddy.keys share/gnome/mime-info/bug-buddy.mime share/gnome/omf/bug-buddy/bug-buddy-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/bug-buddy.png +share/locale/am/LC_MESSAGES/bug-buddy.mo share/locale/ar/LC_MESSAGES/bug-buddy.mo share/locale/az/LC_MESSAGES/bug-buddy.mo +share/locale/be/LC_MESSAGES/bug-buddy.mo share/locale/bg/LC_MESSAGES/bug-buddy.mo share/locale/ca/LC_MESSAGES/bug-buddy.mo share/locale/cs/LC_MESSAGES/bug-buddy.mo @@ -36,12 +39,15 @@ share/locale/fi/LC_MESSAGES/bug-buddy.mo share/locale/fr/LC_MESSAGES/bug-buddy.mo share/locale/ga/LC_MESSAGES/bug-buddy.mo share/locale/gl/LC_MESSAGES/bug-buddy.mo +share/locale/he/LC_MESSAGES/bug-buddy.mo share/locale/hu/LC_MESSAGES/bug-buddy.mo share/locale/it/LC_MESSAGES/bug-buddy.mo share/locale/ja/LC_MESSAGES/bug-buddy.mo share/locale/ko/LC_MESSAGES/bug-buddy.mo share/locale/lt/LC_MESSAGES/bug-buddy.mo share/locale/lv/LC_MESSAGES/bug-buddy.mo +share/locale/mk/LC_MESSAGES/bug-buddy.mo +share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo @@ -53,6 +59,7 @@ share/locale/ro/LC_MESSAGES/bug-buddy.mo share/locale/ru/LC_MESSAGES/bug-buddy.mo share/locale/sk/LC_MESSAGES/bug-buddy.mo share/locale/sl/LC_MESSAGES/bug-buddy.mo +share/locale/sq/LC_MESSAGES/bug-buddy.mo share/locale/sv/LC_MESSAGES/bug-buddy.mo share/locale/tr/LC_MESSAGES/bug-buddy.mo share/locale/uk/LC_MESSAGES/bug-buddy.mo @@ -67,3 +74,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo @dirrm share/gnome/bug-buddy/bugzilla/gnome @dirrm share/gnome/bug-buddy/bugzilla @dirrm share/gnome/bug-buddy +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/bug-buddy/bug-buddy-C.omf 2>/dev/null || /usr/bin/true diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index bb54a6c674af..f47d5186f56f 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 1.2.1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/1.2 +MASTER_SITE_SUBDIR= sources/GConf/2.2 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,7 +17,7 @@ MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= ORBit-2.0:${PORTSDIR}/devel/ORBit2 \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_GMAKE= yes @@ -35,6 +35,8 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: @${MKDIR} ${PREFIX}/etc/gconf/gconf.xml.defaults/apps diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index cf74a49ffc84..790114ae0751 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1 +1 @@ -MD5 (gnome2/GConf-1.2.1.tar.bz2) = 4e5ffdebd7dbf6d86459f6e57f8d772c +MD5 (gnome2/GConf-2.2.0.tar.bz2) = 07ed2f6c583d5664cd728787cf59219b diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index 180dc0cbf885..dc75fdb1daa7 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -49,6 +49,7 @@ share/doc/gconf/x462.html share/doc/gconf/x485.html share/locale/ar/LC_MESSAGES/GConf2.mo share/locale/az/LC_MESSAGES/GConf2.mo +share/locale/be/LC_MESSAGES/GConf2.mo share/locale/bg/LC_MESSAGES/GConf2.mo share/locale/ca/LC_MESSAGES/GConf2.mo share/locale/cs/LC_MESSAGES/GConf2.mo @@ -65,6 +66,7 @@ share/locale/hu/LC_MESSAGES/GConf2.mo share/locale/it/LC_MESSAGES/GConf2.mo share/locale/ja/LC_MESSAGES/GConf2.mo share/locale/ko/LC_MESSAGES/GConf2.mo +share/locale/lv/LC_MESSAGES/GConf2.mo share/locale/ms/LC_MESSAGES/GConf2.mo share/locale/nl/LC_MESSAGES/GConf2.mo share/locale/nn/LC_MESSAGES/GConf2.mo @@ -82,8 +84,11 @@ share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo +share/sgml/gconf/gconf-1.0.dtd +@dirrm share/sgml/gconf @dirrm share/doc/gconf @dirrm lib/GConf/2 @dirrm include/gconf/2/gconf @dirrm include/gconf/2 @dirrm etc/gconf/2 +@unexec /bin/rmdir %D/share/sgml 2>/dev/null || /usr/bin/true diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index a07cd062dae9..4118b66d802d 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,9 +6,9 @@ # PORTNAME= glib -PORTVERSION= 2.0.7 +PORTVERSION= 2.2.1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.0,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -35,7 +35,7 @@ USE_GMAKE= yes USE_PERL5= yes CONFIGURE_ARGS= --enable-static --with-libiconv=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ + LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index cd80c6bbff02..4ec1b98ee324 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1 +1 @@ -MD5 (gnome2/glib-2.0.7.tar.bz2) = 5882b1e729f57cb18af653a2f504197b +MD5 (gnome2/glib-2.2.1.tar.bz2) = 42406a17819080326e105f8333963b97 diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae index fc794d3256de..659943e02833 100644 --- a/devel/glib20/files/patch-ae +++ b/devel/glib20/files/patch-ae @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Fri Mar 29 01:26:14 2002 -+++ configure Fri Apr 26 09:01:50 2002 -@@ -10597,6 +10597,7 @@ +--- configure.orig Mon Dec 2 16:34:49 2002 ++++ configure Tue Dec 3 18:21:22 2002 +@@ -11259,6 +11259,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,23 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -17619,8 +17620,8 @@ - rm -f conftest.$ac_objext conftest.$ac_ext - fi - ;; -- *-freebsd2.2*) -- G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE" -+ *-freebsd*) -+ G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS" - - # FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support - # -mthreads flag. -@@ -17702,7 +17703,7 @@ - *-*-openbsd* | *-*-freebsd*) - # FreeBSD and OpenBSD want us to use the -pthread flag - # instead of linking to -lc_r and libtool enforces that. -- G_THREAD_LIBS="-pthread" -+ G_THREAD_LIBS="$PTHREAD_LIBS" - ;; - *) - for thread_lib in "" pthread pthread32 pthreads thread dce; do diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 8ec95ad45521..52d8bb07ad1c 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -28,6 +28,7 @@ include/glib-2.0/glib/gmessages.h include/glib-2.0/glib/gnode.h include/glib-2.0/glib/gpattern.h include/glib-2.0/glib/gprimes.h +include/glib-2.0/glib/gprintf.h include/glib-2.0/glib/gqsort.h include/glib-2.0/glib/gquark.h include/glib-2.0/glib/gqueue.h @@ -68,16 +69,16 @@ include/glib-2.0/gobject/gvaluecollector.h include/glib-2.0/gobject/gvaluetypes.h lib/libglib-2.0.a lib/libglib-2.0.so -lib/libglib-2.0.so.0 +lib/libglib-2.0.so.200 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.0 +lib/libgmodule-2.0.so.200 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.0 +lib/libgobject-2.0.so.200 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.0 +lib/libgthread-2.0.so.200 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc libdata/pkgconfig/gobject-2.0.pc @@ -85,20 +86,26 @@ libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 share/aclocal/glib-gettext.m4 share/glib-2.0/gettext/po/Makefile.in.in -share/locale/ar/LC_MESSAGES/glib20.mo +share/locale/am/LC_MESSAGES/glib20.mo share/locale/az/LC_MESSAGES/glib20.mo share/locale/be/LC_MESSAGES/glib20.mo share/locale/bg/LC_MESSAGES/glib20.mo +share/locale/bn/LC_MESSAGES/glib20.mo share/locale/ca/LC_MESSAGES/glib20.mo share/locale/cs/LC_MESSAGES/glib20.mo +share/locale/da/LC_MESSAGES/glib20.mo share/locale/de/LC_MESSAGES/glib20.mo share/locale/el/LC_MESSAGES/glib20.mo share/locale/es/LC_MESSAGES/glib20.mo +share/locale/et/LC_MESSAGES/glib20.mo share/locale/eu/LC_MESSAGES/glib20.mo +share/locale/fi/LC_MESSAGES/glib20.mo share/locale/fr/LC_MESSAGES/glib20.mo share/locale/gl/LC_MESSAGES/glib20.mo +share/locale/hi/LC_MESSAGES/glib20.mo share/locale/ja/LC_MESSAGES/glib20.mo share/locale/ko/LC_MESSAGES/glib20.mo +share/locale/mn/LC_MESSAGES/glib20.mo share/locale/ms/LC_MESSAGES/glib20.mo share/locale/nl/LC_MESSAGES/glib20.mo share/locale/nn/LC_MESSAGES/glib20.mo @@ -110,6 +117,7 @@ share/locale/ro/LC_MESSAGES/glib20.mo share/locale/ru/LC_MESSAGES/glib20.mo share/locale/sk/LC_MESSAGES/glib20.mo share/locale/sl/LC_MESSAGES/glib20.mo +share/locale/sq/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 9af2e61c9861..daa9d0eb2095 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.0 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,14 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - BSD_PTHREAD_LIB=${PTHREAD_LIBS} + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libgnomevfs/Makefile.in .include <bsd.port.mk> diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 1a127726ae2a..0c26e6bc9d66 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f +MD5 (gnome2/gnome-vfs-2.2.0.tar.bz2) = da9caa0a7d2793b99b13fd3ba7ba1391 diff --git a/devel/gnome-vfs/files/patch-aa b/devel/gnome-vfs/files/patch-aa index aad92d16177f..b8b7c365ee84 100644 --- a/devel/gnome-vfs/files/patch-aa +++ b/devel/gnome-vfs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 13 09:10:52 2002 -+++ configure Wed Nov 13 10:46:27 2002 -@@ -5726,6 +5726,7 @@ +--- configure.orig Mon Jan 13 09:43:49 2003 ++++ configure Tue Jan 14 00:48:38 2003 +@@ -8122,6 +8122,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,40 +8,41 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9392,8 +9393,8 @@ +@@ -12680,8 +12681,8 @@ done fi --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9397: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9397: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9406,10 +9407,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5 +-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 + if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12697,11 +12698,11 @@ + #endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit(); -+char BZ2_bzCompressInit(); - - int main() { --bzCompressInit() -+BZ2_bzCompressInit() - ; return 0; } - EOF - if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -9704,7 +9705,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 + builtin and then its argument prototype would still apply. */ +-char bzCompressInit (); ++char BZ2_bzCompressInit (); + int + main () + { +-bzCompressInit (); ++BZ2_bzCompressInit (); + ; + return 0; + } +@@ -13245,7 +13246,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" - cat > conftest.$ac_ext <<EOF - #line 9710 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -9739,9 +9740,9 @@ +@@ -13296,9 +13297,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -51,14 +52,14 @@ - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="-lssl -lcryptofoo" fi - -@@ -10570,7 +10571,7 @@ - s%@ORBIT_IDL@%$ORBIT_IDL%g - s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g - s%@WARN_CFLAGS@%$WARN_CFLAGS%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g - s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g + +@@ -14894,7 +14895,7 @@ + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t +-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t ++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/devel/gnome-vfs/files/patch-ab b/devel/gnome-vfs/files/patch-ab index 2b87972bc28a..3c0b987bbdb2 100644 --- a/devel/gnome-vfs/files/patch-ab +++ b/devel/gnome-vfs/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed Nov 13 10:46:51 2002 -+++ Makefile.in Wed Nov 13 10:47:52 2002 -@@ -170,7 +170,7 @@ +--- Makefile.in.orig Tue Jan 14 00:48:58 2003 ++++ Makefile.in Tue Jan 14 00:50:11 2003 +@@ -177,7 +177,6 @@ + schemas \ + devel-docs \ + doc \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in index 7e959d704f4c..f9b09d46b7a3 100644 --- a/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnome-vfs/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,5 +1,8 @@ ---- gnome-vfs-module-2.0.pc.in.orig Wed Jan 30 20:28:20 2002 -+++ gnome-vfs-module-2.0.pc.in Wed Nov 13 10:49:35 2002 + +$FreeBSD$ + +--- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 ++++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ diff --git a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in index 1b09b31af872..6e6adc74537d 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed Nov 13 10:51:57 2002 -+++ libgnomevfs/Makefile.in Wed Nov 13 10:52:09 2002 -@@ -192,7 +192,7 @@ - +--- libgnomevfs/Makefile.in.orig Tue Jan 14 00:50:29 2003 ++++ libgnomevfs/Makefile.in Tue Jan 14 00:51:03 2003 +@@ -341,7 +341,7 @@ + # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - ++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c index c9cffae7aa99..39d34d5573fb 100644 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,14 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 17:01:22 2002 -+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 17:02:24 2002 -@@ -774,7 +774,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 ++++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 +@@ -40,6 +40,7 @@ + #include <pwd.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -861,7 +862,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in b/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in deleted file mode 100644 index 05476dd54787..000000000000 --- a/devel/gnome-vfs/files/patch-modules::vfolder::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/Makefile.in.orig Wed Nov 13 11:05:45 2002 -+++ modules/vfolder/Makefile.in Wed Nov 13 11:06:24 2002 -@@ -221,7 +221,7 @@ - - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. --LIBS = @LIBS@ -+LIBS = @LIBS@ @PTHREAD_LIB@ - libvfolder_desktop_la_DEPENDENCIES = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la - libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c new file mode 100644 index 000000000000..a07d0bc81b39 --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c @@ -0,0 +1,11 @@ +--- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 ++++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 +@@ -1721,7 +1721,7 @@ + + for (i = 0; ppath[i] != NULL; i++) { + dir = g_build_filename (ppath[i], +- "/share/applications/", ++ "/share/gnome/applications/", + NULL); + id = itemdir_new (info, + dir, diff --git a/devel/gnome-vfs/pkg-plist b/devel/gnome-vfs/pkg-plist index 2635ed36573b..0de6103098c9 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -1,5 +1,3 @@ -etc/gconf/gconf.xml.defaults/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml @@ -8,11 +6,11 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gnome-vfs-2.0/modules/default-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info +etc/gnome-vfs-2.0/vfolders/network.vfolder-info etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info -include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h @@ -39,11 +37,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-magic.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h @@ -90,7 +85,98 @@ lib/vfs/2.0/extfs/zoo libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo @@ -107,6 +193,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo @@ -134,19 +221,13 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/gnome-vfs-2.0/modules -@dirrm lib/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 -@dirrm lib/vfs @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs -@dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders -@dirrm etc/gnome-vfs-2.0/modules -@dirrm etc/gnome-vfs-2.0 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index 9af2e61c9861..daa9d0eb2095 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.0.4.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.0 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.2 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,14 +26,17 @@ USE_GNOME= gnomeprefix gnomehack gnomehier gnomemimedata USE_REINPLACE= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - BSD_PTHREAD_LIB=${PTHREAD_LIBS} + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ + BSD_PTHREAD_LIBS=${PTHREAD_LIBS} CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC} -name "*info.in" | xargs ${REINPLACE_CMD} -e \ 's|\@datadir\@/gnome|\@datadir\@|g' + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libgnomevfs/Makefile.in .include <bsd.port.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 1a127726ae2a..0c26e6bc9d66 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-vfs-2.0.4.1.tar.bz2) = 1d9ef5f9570268338512f9da1e6a8c6f +MD5 (gnome2/gnome-vfs-2.2.0.tar.bz2) = da9caa0a7d2793b99b13fd3ba7ba1391 diff --git a/devel/gnomevfs2/files/patch-aa b/devel/gnomevfs2/files/patch-aa index aad92d16177f..b8b7c365ee84 100644 --- a/devel/gnomevfs2/files/patch-aa +++ b/devel/gnomevfs2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Nov 13 09:10:52 2002 -+++ configure Wed Nov 13 10:46:27 2002 -@@ -5726,6 +5726,7 @@ +--- configure.orig Mon Jan 13 09:43:49 2003 ++++ configure Tue Jan 14 00:48:38 2003 +@@ -8122,6 +8122,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,40 +8,41 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9392,8 +9393,8 @@ +@@ -12680,8 +12681,8 @@ done fi --echo $ac_n "checking for bzCompressInit in -lbz2""... $ac_c" 1>&6 --echo "configure:9397: checking for bzCompressInit in -lbz2" >&5 -+echo $ac_n "checking for BZ2_bzCompressInit in -lbz2""... $ac_c" 1>&6 -+echo "configure:9397: checking for BZ2_bzCompressInit in -lbz2" >&5 - ac_lib_var=`echo bz2'_'bzCompressInit | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -9406,10 +9407,10 @@ - /* Override any gcc2 internal prototype to avoid an error. */ +-echo "$as_me:$LINENO: checking for bzCompressInit in -lbz2" >&5 +-echo $ECHO_N "checking for bzCompressInit in -lbz2... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for BZ2_bzCompressInit in -lbz2" >&5 ++echo $ECHO_N "checking for BZ2_bzCompressInit in -lbz2... $ECHO_C" >&6 + if test "${ac_cv_lib_bz2_bzCompressInit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -12697,11 +12698,11 @@ + #endif /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char bzCompressInit(); -+char BZ2_bzCompressInit(); - - int main() { --bzCompressInit() -+BZ2_bzCompressInit() - ; return 0; } - EOF - if { (eval echo configure:9416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -@@ -9704,7 +9705,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 + builtin and then its argument prototype would still apply. */ +-char bzCompressInit (); ++char BZ2_bzCompressInit (); + int + main () + { +-bzCompressInit (); ++BZ2_bzCompressInit (); + ; + return 0; + } +@@ -13245,7 +13246,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 else - + - LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcrypto -ldl" + LDFLAGS="$LDFLAGS -L$with_openssl_libs -lssl -lcryptofoo -ldl" - cat > conftest.$ac_ext <<EOF - #line 9710 "configure" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" #include "confdefs.h" -@@ -9739,9 +9740,9 @@ +@@ -13296,9 +13297,9 @@ msg_openssl="yes" if test x$with_openssl_libs != x/usr/lib; then @@ -51,14 +52,14 @@ - OPENSSL_LIBS="-lssl -lcrypto" + OPENSSL_LIBS="-lssl -lcryptofoo" fi - -@@ -10570,7 +10571,7 @@ - s%@ORBIT_IDL@%$ORBIT_IDL%g - s%@BONOBO_IDLDIR@%$BONOBO_IDLDIR%g - s%@WARN_CFLAGS@%$WARN_CFLAGS%g --s%@PTHREAD_LIB@%$PTHREAD_LIB%g -+s%@PTHREAD_LIB@%$BSD_PTHREAD_LIB%g - s%@GETTEXT_PACKAGE@%$GETTEXT_PACKAGE%g - s%@ALLOCA@%$ALLOCA%g - s%@USE_NLS@%$USE_NLS%g + +@@ -14894,7 +14895,7 @@ + s,@ORBIT_IDL@,$ORBIT_IDL,;t t + s,@BONOBO_IDLDIR@,$BONOBO_IDLDIR,;t t + s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t +-s,@PTHREAD_LIB@,$PTHREAD_LIB,;t t ++s,@PTHREAD_LIB@,$BSD_PTHREAD_LIBS,;t t + s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t + s,@USE_NLS@,$USE_NLS,;t t + s,@MSGFMT@,$MSGFMT,;t t diff --git a/devel/gnomevfs2/files/patch-ab b/devel/gnomevfs2/files/patch-ab index 2b87972bc28a..3c0b987bbdb2 100644 --- a/devel/gnomevfs2/files/patch-ab +++ b/devel/gnomevfs2/files/patch-ab @@ -1,11 +1,10 @@ ---- Makefile.in.orig Wed Nov 13 10:46:51 2002 -+++ Makefile.in Wed Nov 13 10:47:52 2002 -@@ -170,7 +170,7 @@ +--- Makefile.in.orig Tue Jan 14 00:48:58 2003 ++++ Makefile.in Tue Jan 14 00:50:11 2003 +@@ -177,7 +177,6 @@ + schemas \ + devel-docs \ + doc \ +- test \ + monikers \ + po - SUBDIRS_GNOME = monikers doc schemas - --SUBDIRS = libgnomevfs modules schemas devel-docs doc test monikers po -+SUBDIRS = libgnomevfs modules schemas devel-docs doc monikers po - - - EXTRA_DIST = HACKING TODO autogen.sh gnome-vfs.spec gnome-vfs-2.0.pc.in gnome-vfs-module-2.0.pc.in intltool-extract.in intltool-merge.in intltool-update.in diff --git a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in index 7e959d704f4c..f9b09d46b7a3 100644 --- a/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in +++ b/devel/gnomevfs2/files/patch-gnome-vfs-module-2.0.pc.in @@ -1,5 +1,8 @@ ---- gnome-vfs-module-2.0.pc.in.orig Wed Jan 30 20:28:20 2002 -+++ gnome-vfs-module-2.0.pc.in Wed Nov 13 10:49:35 2002 + +$FreeBSD$ + +--- gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:42 1.1 ++++ gnome-vfs-module-2.0.pc.in 2002/02/16 13:07:51 @@ -8,5 +8,5 @@ Description: The GNOME virtual file-system module include info Version: @VERSION@ diff --git a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in index 1b09b31af872..6e6adc74537d 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in +++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in @@ -1,11 +1,11 @@ ---- libgnomevfs/Makefile.in.orig Wed Nov 13 10:51:57 2002 -+++ libgnomevfs/Makefile.in Wed Nov 13 10:52:09 2002 -@@ -192,7 +192,7 @@ - +--- libgnomevfs/Makefile.in.orig Tue Jan 14 00:50:29 2003 ++++ libgnomevfs/Makefile.in Tue Jan 14 00:51:03 2003 +@@ -341,7 +341,7 @@ + # CLEANFILES = $(BUILT_SOURCES) # Platform specific includes -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include -+libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/include - libgnomevfsplatforminclude_HEADERS = gnome-vfs-file-size.h - ++libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs + libgnomevfsplatforminclude_HEADERS = \ + gnome-vfs-file-size.h diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c index c9cffae7aa99..39d34d5573fb 100644 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c +++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c @@ -1,6 +1,14 @@ ---- libgnomevfs/gnome-vfs-utils.c.orig Sun May 5 17:01:22 2002 -+++ libgnomevfs/gnome-vfs-utils.c Sun May 5 17:02:24 2002 -@@ -774,7 +774,7 @@ +--- libgnomevfs/gnome-vfs-utils.c.orig Fri Dec 20 16:15:06 2002 ++++ libgnomevfs/gnome-vfs-utils.c Tue Jan 14 00:54:10 2003 +@@ -40,6 +40,7 @@ + #include <pwd.h> + #include <stdlib.h> + #include <string.h> ++#include <sys/param.h> + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> +@@ -861,7 +862,7 @@ paths = g_strsplit (gnome_var, ":", 0); for (temp_paths = paths; *temp_paths != NULL; temp_paths++) { diff --git a/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in b/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in deleted file mode 100644 index 05476dd54787..000000000000 --- a/devel/gnomevfs2/files/patch-modules::vfolder::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/vfolder/Makefile.in.orig Wed Nov 13 11:05:45 2002 -+++ modules/vfolder/Makefile.in Wed Nov 13 11:06:24 2002 -@@ -221,7 +221,7 @@ - - - DEFS = @DEFS@ -I. -I$(srcdir) -I../.. --LIBS = @LIBS@ -+LIBS = @LIBS@ @PTHREAD_LIB@ - libvfolder_desktop_la_DEPENDENCIES = \ - $(top_builddir)/libgnomevfs/libgnomevfs-2.la - libvfolder_desktop_la_OBJECTS = vfolder-info.lo vfolder-util.lo \ diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c new file mode 100644 index 000000000000..a07d0bc81b39 --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c @@ -0,0 +1,11 @@ +--- modules/vfolder/vfolder-info.c.orig Fri Nov 29 13:40:11 2002 ++++ modules/vfolder/vfolder-info.c Fri Nov 29 13:40:19 2002 +@@ -1721,7 +1721,7 @@ + + for (i = 0; ppath[i] != NULL; i++) { + dir = g_build_filename (ppath[i], +- "/share/applications/", ++ "/share/gnome/applications/", + NULL); + id = itemdir_new (info, + dir, diff --git a/devel/gnomevfs2/pkg-plist b/devel/gnomevfs2/pkg-plist index 2635ed36573b..0de6103098c9 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -1,5 +1,3 @@ -etc/gconf/gconf.xml.defaults/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml etc/gconf/gconf.xml.defaults/system/%gconf.xml @@ -8,11 +6,11 @@ etc/gconf/schemas/system_http_proxy.schemas etc/gnome-vfs-2.0/modules/default-modules.conf etc/gnome-vfs-2.0/vfolders/applications-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/favorites.vfolder-info +etc/gnome-vfs-2.0/vfolders/network.vfolder-info etc/gnome-vfs-2.0/vfolders/preferences-all-users.vfolder-info etc/gnome-vfs-2.0/vfolders/server-settings.vfolder-info etc/gnome-vfs-2.0/vfolders/start-here.vfolder-info etc/gnome-vfs-2.0/vfolders/system-settings.vfolder-info -include/gnome-vfs-2.0/include/gnome-vfs-file-size.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-async-ops.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-cancellation.h @@ -39,11 +37,8 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-xfer.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-cancellable-ops.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-inet-connection.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-iobuf.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-method.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-info.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-magic.h -include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime-sniff-buffer.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-mime.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-callback-module-api.h include/gnome-vfs-module-2.0/libgnomevfs/gnome-vfs-module-shared.h @@ -90,7 +85,98 @@ lib/vfs/2.0/extfs/zoo libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc libdata/pkgconfig/gnome-vfs-module-2.0.pc -share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo +share/doc/gnome-vfs-2.0/about.html +share/doc/gnome-vfs-2.0/advanced-operations.html +share/doc/gnome-vfs-2.0/c9456.html +share/doc/gnome-vfs-2.0/c9466.html +share/doc/gnome-vfs-2.0/ch08.html +share/doc/gnome-vfs-2.0/data-types.html +share/doc/gnome-vfs-2.0/directory-operations.html +share/doc/gnome-vfs-2.0/everything-else.html +share/doc/gnome-vfs-2.0/file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html +share/doc/gnome-vfs-2.0/gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html +share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html +share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-cancellation.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-database.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html +share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html +share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html +share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html +share/doc/gnome-vfs-2.0/gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html +share/doc/gnome-vfs-2.0/gnome-vfs-mime.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html +share/doc/gnome-vfs-2.0/gnome-vfs-module.html +share/doc/gnome-vfs-2.0/gnome-vfs-ops.html +share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html +share/doc/gnome-vfs-2.0/gnome-vfs-process.html +share/doc/gnome-vfs-2.0/gnome-vfs-result.html +share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html +share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html +share/doc/gnome-vfs-2.0/gnome-vfs-types.html +share/doc/gnome-vfs-2.0/gnome-vfs-uri.html +share/doc/gnome-vfs-2.0/gnome-vfs-utils.html +share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html +share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html +share/doc/gnome-vfs-2.0/index.html +share/doc/gnome-vfs-2.0/index.sgml +share/doc/gnome-vfs-2.0/mime-registry.html +share/doc/gnome-vfs-2.0/modules.html +share/doc/gnome-vfs-2.0/writing-modules.html +share/doc/gnome-vfs-2.0/x27.html share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/be/LC_MESSAGES/gnome-vfs-2.0.mo @@ -107,6 +193,7 @@ share/locale/fi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/fr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ga/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/gl/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/he/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/hu/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo @@ -134,19 +221,13 @@ share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo @dirrm share/doc/gnome-vfs-2.0 -@dirrm lib/gnome-vfs-2.0/modules -@dirrm lib/gnome-vfs-2.0 @dirrm lib/vfs/2.0/extfs @dirrm lib/vfs/2.0 -@dirrm lib/vfs @dirrm include/gnome-vfs-module-2.0/libgnomevfs @dirrm include/gnome-vfs-module-2.0 @dirrm include/gnome-vfs-2.0/libgnomevfs -@dirrm include/gnome-vfs-2.0/include @dirrm include/gnome-vfs-2.0 @dirrm etc/gnome-vfs-2.0/vfolders -@dirrm etc/gnome-vfs-2.0/modules -@dirrm etc/gnome-vfs-2.0 @dirrm etc/gconf/gconf.xml.defaults/system/http_proxy @dirrm etc/gconf/gconf.xml.defaults/system @dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile index 38eea056c723..54cd11625ec9 100644 --- a/devel/gob2/Makefile +++ b/devel/gob2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gob2 PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -14,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile index ef24d0667882..9a0495394e25 100644 --- a/devel/libIDL/Makefile +++ b/devel/libIDL/Makefile @@ -7,6 +7,7 @@ PORTNAME= libIDL PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 @@ -14,11 +15,13 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes @@ -27,8 +30,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 66f514e93a23..00794e595390 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libbonobo -PORTVERSION= 2.0.1 +PORTVERSION= 2.2.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -22,6 +22,8 @@ USE_BISON= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -29,9 +31,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAKE_ENV= gnomelocaledir=${PREFIX}/share/locale -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g' - .include <bsd.port.mk> diff --git a/devel/libbonobo/distinfo b/devel/libbonobo/distinfo index 4336cdd2f3b2..ae18e5ce86fa 100644 --- a/devel/libbonobo/distinfo +++ b/devel/libbonobo/distinfo @@ -1 +1 @@ -MD5 (gnome2/libbonobo-2.0.1.tar.bz2) = ef7b5d5621086b7ae9627960b52507fa +MD5 (gnome2/libbonobo-2.2.0.tar.bz2) = 4a17e033d67fa9ed353108a95670794b diff --git a/devel/libbonobo/pkg-plist b/devel/libbonobo/pkg-plist index 85ad3d4256ef..9beb372763d6 100644 --- a/devel/libbonobo/pkg-plist +++ b/devel/libbonobo/pkg-plist @@ -40,6 +40,63 @@ lib/orbit-2.0/Bonobo_module.so libdata/bonobo/servers/Bonobo_Moniker_std.server libdata/bonobo/servers/Bonobo_Sample_Echo.server libdata/pkgconfig/libbonobo-2.0.pc +share/doc/libbonobo/debugging.html +share/doc/libbonobo/factories.html +share/doc/libbonobo/general.html +share/doc/libbonobo/home.png +share/doc/libbonobo/index.html +share/doc/libbonobo/index.sgml +share/doc/libbonobo/left.png +share/doc/libbonobo/libbonobo-bonobo-arg.html +share/doc/libbonobo/libbonobo-bonobo-config-database.html +share/doc/libbonobo/libbonobo-bonobo-context.html +share/doc/libbonobo/libbonobo-bonobo-event-source.html +share/doc/libbonobo/libbonobo-bonobo-exception.html +share/doc/libbonobo/libbonobo-bonobo-generic-factory.html +share/doc/libbonobo/libbonobo-bonobo-i18n.html +share/doc/libbonobo/libbonobo-bonobo-item-container.html +share/doc/libbonobo/libbonobo-bonobo-item-handler.html +share/doc/libbonobo/libbonobo-bonobo-listener.html +share/doc/libbonobo/libbonobo-bonobo-macros.html +share/doc/libbonobo/libbonobo-bonobo-main.html +share/doc/libbonobo/libbonobo-bonobo-moniker-context.html +share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html +share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html +share/doc/libbonobo/libbonobo-bonobo-moniker-util.html +share/doc/libbonobo/libbonobo-bonobo-moniker.html +share/doc/libbonobo/libbonobo-bonobo-object.html +share/doc/libbonobo/libbonobo-bonobo-persist-client.html +share/doc/libbonobo/libbonobo-bonobo-persist-file.html +share/doc/libbonobo/libbonobo-bonobo-persist-stream.html +share/doc/libbonobo/libbonobo-bonobo-persist.html +share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html +share/doc/libbonobo/libbonobo-bonobo-property-bag.html +share/doc/libbonobo/libbonobo-bonobo-running-context.html +share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html +share/doc/libbonobo/libbonobo-bonobo-shutdown.html +share/doc/libbonobo/libbonobo-bonobo-storage-memory.html +share/doc/libbonobo/libbonobo-bonobo-storage.html +share/doc/libbonobo/libbonobo-bonobo-stream-client.html +share/doc/libbonobo/libbonobo-bonobo-stream-memory.html +share/doc/libbonobo/libbonobo-bonobo-types.html +share/doc/libbonobo/libbonobo-bonobo-xobject.html +share/doc/libbonobo/libbonobo-faq.html +share/doc/libbonobo/libbonobo.devhelp +share/doc/libbonobo/misc.html +share/doc/libbonobo/monikers.html +share/doc/libbonobo/persist-file.png +share/doc/libbonobo/persist-storage.png +share/doc/libbonobo/persist-stream.png +share/doc/libbonobo/persist.html +share/doc/libbonobo/persist.png +share/doc/libbonobo/properties.html +share/doc/libbonobo/property-bags.html +share/doc/libbonobo/refcounting.html +share/doc/libbonobo/right.png +share/doc/libbonobo/storage.png +share/doc/libbonobo/stream.png +share/doc/libbonobo/streams.html +share/doc/libbonobo/up.png share/idl/bonobo-2.0/Bonobo.idl share/idl/bonobo-2.0/Bonobo_Canvas.idl share/idl/bonobo-2.0/Bonobo_Clipboard.idl @@ -58,22 +115,30 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl share/idl/bonobo-2.0/Bonobo_Storage.idl share/idl/bonobo-2.0/Bonobo_UI.idl share/idl/bonobo-2.0/Bonobo_Zoomable.idl +share/locale/am/LC_MESSAGES/libbonobo-2.0.mo share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo share/locale/az/LC_MESSAGES/libbonobo-2.0.mo +share/locale/be/LC_MESSAGES/libbonobo-2.0.mo share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo +share/locale/da/LC_MESSAGES/libbonobo-2.0.mo +share/locale/de/LC_MESSAGES/libbonobo-2.0.mo share/locale/el/LC_MESSAGES/libbonobo-2.0.mo share/locale/es/LC_MESSAGES/libbonobo-2.0.mo +share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo +share/locale/he/LC_MESSAGES/libbonobo-2.0.mo share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo share/locale/it/LC_MESSAGES/libbonobo-2.0.mo share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo +share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo share/locale/ms/LC_MESSAGES/libbonobo-2.0.mo +share/locale/nl/LC_MESSAGES/libbonobo-2.0.mo share/locale/nn/LC_MESSAGES/libbonobo-2.0.mo share/locale/no/LC_MESSAGES/libbonobo-2.0.mo share/locale/pl/LC_MESSAGES/libbonobo-2.0.mo @@ -82,6 +147,7 @@ share/locale/pt_BR/LC_MESSAGES/libbonobo-2.0.mo share/locale/ru/LC_MESSAGES/libbonobo-2.0.mo share/locale/sk/LC_MESSAGES/libbonobo-2.0.mo share/locale/sl/LC_MESSAGES/libbonobo-2.0.mo +share/locale/sq/LC_MESSAGES/libbonobo-2.0.mo share/locale/sv/LC_MESSAGES/libbonobo-2.0.mo share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 98deb4a32749..c606d5b68bcb 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libglade2 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 @@ -17,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat USE_BZIP2= yes @@ -26,13 +27,11 @@ USE_REINPLACE= yes USE_GMAKE= yes USE_PYTHON= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist index 9581dd4b3a3a..26d93e2c2867 100644 --- a/devel/libglade2/pkg-plist +++ b/devel/libglade2/pkg-plist @@ -26,4 +26,3 @@ share/xml/libglade/glade-2.0.dtd @dirrm share/doc/libglade @dirrm include/libglade-2.0/glade @dirrm include/libglade-2.0 -@unexec /bin/rmdir %D/share/xml 2>/dev/null || /usr/bin/true diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index e7052e6a04cc..7b3941a708f6 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgsf -PORTVERSION= 1.6.0 +PORTVERSION= 1.7.2 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.7 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index dab04be51e5b..22b7a7c76096 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgsf-1.6.0.tar.bz2) = 530c8c6ef9e919fb1a32f3d2993043f3 +MD5 (gnome2/libgsf-1.7.2.tar.bz2) = b89147bf49e5840f87f6f9b83a28e86d diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure index 2c312dcc0109..de62becfec42 100644 --- a/devel/libgsf/files/patch-configure +++ b/devel/libgsf/files/patch-configure @@ -8,12 +8,3 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8279,7 +8280,7 @@ - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --need_posix=yes -+need_posix=no - fi - rm -f conftest.$ac_objext conftest.$ac_ext - CFLAGS="$saved_CFLAGS" diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 74642042def2..74a98ba07677 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -30,10 +30,10 @@ include/libgsf-1/gsf/gsf-utils.h include/libgsf-1/gsf/gsf.h lib/libgsf-1.a lib/libgsf-1.so -lib/libgsf-1.so.7 +lib/libgsf-1.so.8 lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.7 +lib/libgsf-gnome-1.so.8 libdata/pkgconfig/libgsf-1.pc libdata/pkgconfig/libgsf-gnome-1.pc share/doc/gsf/gsf-gsf-impl-utils.html diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 7e56f2815d5b..c437aea009a1 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgtop2 PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 @@ -15,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_PERL5= yes diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile index 7c24dab07e60..0b2d61edb2b2 100644 --- a/editors/gedit2/Makefile +++ b/editors/gedit2/Makefile @@ -6,18 +6,19 @@ # PORTNAME= gedit2 -PORTVERSION= 2.0.6 +PORTVERSION= 2.2.0.1 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DISTNAME= gedit-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \ - gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - eel-2.2:${PORTSDIR}/x11-toolkits/eel2 +LIB_DEPENDS= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \ + gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + eel-2.4:${PORTSDIR}/x11-toolkits/eel2 \ + pspell.15:${PORTSDIR}/textproc/aspell WRKSRC= ${WRKDIR}/gedit-${PORTVERSION} diff --git a/editors/gedit2/distinfo b/editors/gedit2/distinfo index 3d9b91f2eb43..2c967280e35e 100644 --- a/editors/gedit2/distinfo +++ b/editors/gedit2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gedit-2.0.6.tar.bz2) = 4dd4016136b0f45c7b4cc767bba77972 +MD5 (gnome2/gedit-2.2.0.1.tar.bz2) = 2756cba802d1ee0c3abb93fa5d77deb5 diff --git a/editors/gedit2/files/patch-configure b/editors/gedit2/files/patch-configure index 816545988e64..843cf5e98068 100644 --- a/editors/gedit2/files/patch-configure +++ b/editors/gedit2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 15 00:43:11 2002 -+++ configure Wed May 15 00:45:35 2002 -@@ -6547,6 +6547,7 @@ +--- configure.orig Tue Dec 17 05:27:57 2002 ++++ configure Sun Dec 22 17:31:25 2002 +@@ -7270,6 +7270,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,16 +8,24 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9358,10 +9359,10 @@ +@@ -10758,17 +10759,17 @@ + if test "x${prefix}" = "xNONE"; then + + cat >>confdefs.h <<_ACEOF +-#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" ++ + _ACEOF + pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" else - cat >>confdefs.h <<EOF + + cat >>confdefs.h <<_ACEOF -#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" +#define PIXMAPS_DIR "${datadir}/pixmaps" - EOF + _ACEOF - pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" + pixmapsdir="${datadir}/pixmaps" fi - # Extract the first word of "glib-genmarshal", so it can be a program name with args. + diff --git a/editors/gedit2/files/patch-plugins_sort_Makefile.in b/editors/gedit2/files/patch-plugins_sort_Makefile.in new file mode 100644 index 000000000000..374734fd7883 --- /dev/null +++ b/editors/gedit2/files/patch-plugins_sort_Makefile.in @@ -0,0 +1,11 @@ +--- plugins/sort/Makefile.in.orig Tue Oct 15 01:25:09 2002 ++++ plugins/sort/Makefile.in Tue Oct 15 01:25:22 2002 +@@ -152,7 +152,7 @@ + + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. + LIBS = @LIBS@ +-libsort_la_LDFLAGS = ++libsort_la_LDFLAGS = -module -avoid-version + libsort_la_LIBADD = + libsort_la_OBJECTS = sort.lo + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist index 15f97d2bda55..1aab77737705 100644 --- a/editors/gedit2/pkg-plist +++ b/editors/gedit2/pkg-plist @@ -3,9 +3,11 @@ bin/gnome-text-editor etc/gconf/gconf.xml.defaults/apps/gedit-2/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml @@ -20,9 +22,11 @@ etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/ui/toolbar/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml @@ -35,41 +39,66 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf. etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml etc/gconf/schemas/gedit.schemas +lib/gedit-2/plugins/ascii.gedit-plugin +lib/gedit-2/plugins/cvschangelog.gedit-plugin +lib/gedit-2/plugins/diff.gedit-plugin +lib/gedit-2/plugins/docinfo.gedit-plugin +lib/gedit-2/plugins/indent.gedit-plugin lib/gedit-2/plugins/libasciitable.so lib/gedit-2/plugins/libcvschangelog.so lib/gedit-2/plugins/libdiff.so lib/gedit-2/plugins/libdocinfo.so +lib/gedit-2/plugins/libindent.so lib/gedit-2/plugins/libsample.so lib/gedit-2/plugins/libshell_output.so +lib/gedit-2/plugins/libsort.so +lib/gedit-2/plugins/libspell.so lib/gedit-2/plugins/libtaglist.so lib/gedit-2/plugins/libtime.so +lib/gedit-2/plugins/sample.gedit-plugin +lib/gedit-2/plugins/shell_output.gedit-plugin +lib/gedit-2/plugins/sort.gedit-plugin +lib/gedit-2/plugins/spell.gedit-plugin +lib/gedit-2/plugins/taglist.gedit-plugin +lib/gedit-2/plugins/time.gedit-plugin libdata/bonobo/servers/GNOME_Gedit.server +share/gnome/application-registry/gedit.applications share/gnome/applications/gedit.desktop share/gnome/gedit-2/glade/asciitable.glade2 share/gnome/gedit-2/glade/diff.glade2 share/gnome/gedit-2/glade/docinfo.glade2 +share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2 share/gnome/gedit-2/glade/gedit-preferences.glade2 share/gnome/gedit-2/glade/goto-line.glade2 +share/gnome/gedit-2/glade/languages-dialog.glade2 share/gnome/gedit-2/glade/plugin-manager.glade2 share/gnome/gedit-2/glade/program-location-dialog.glade2 share/gnome/gedit-2/glade/replace.glade2 share/gnome/gedit-2/glade/shell_output.glade2 +share/gnome/gedit-2/glade/sort.glade2 +share/gnome/gedit-2/glade/spell-checker.glade2 share/gnome/gedit-2/glade/time.glade2 share/gnome/gedit-2/glade/uri.glade2 share/gnome/gedit-2/taglist/HTML.tags share/gnome/gedit-2/taglist/Latex.tags +share/gnome/gedit-2/taglist/XSLT.tags share/gnome/gedit-2/ui/gedit-ui.xml share/gnome/help/gedit/C/figures/gedit_window.png share/gnome/help/gedit/C/gedit.xml share/gnome/help/gedit/C/legal.xml -share/gnome/help/gedit/C/topic.dat +share/gnome/help/gedit/ro/figures/gedit_window.png +share/gnome/help/gedit/ro/gedit.xml +share/gnome/help/gedit/ro/legal.xml share/gnome/idl/GNOME_Gedit.idl share/gnome/mime-info/gedit.keys share/gnome/omf/gedit/gedit-C.omf +share/gnome/omf/gedit/gedit-ro.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true +@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gedit-icon.png share/gnome/pixmaps/gedit-logo.png share/gnome/pixmaps/gedit-plugin-manager.png -share/gnome/pixmaps/shell-output-logo.png +share/locale/am/LC_MESSAGES/gedit-2.0.mo share/locale/ar/LC_MESSAGES/gedit-2.0.mo share/locale/az/LC_MESSAGES/gedit-2.0.mo share/locale/be/LC_MESSAGES/gedit-2.0.mo @@ -86,6 +115,7 @@ share/locale/fi/LC_MESSAGES/gedit-2.0.mo share/locale/fr/LC_MESSAGES/gedit-2.0.mo share/locale/ga/LC_MESSAGES/gedit-2.0.mo share/locale/gl/LC_MESSAGES/gedit-2.0.mo +share/locale/he/LC_MESSAGES/gedit-2.0.mo share/locale/hi/LC_MESSAGES/gedit-2.0.mo share/locale/hu/LC_MESSAGES/gedit-2.0.mo share/locale/it/LC_MESSAGES/gedit-2.0.mo @@ -93,6 +123,8 @@ share/locale/ja/LC_MESSAGES/gedit-2.0.mo share/locale/ko/LC_MESSAGES/gedit-2.0.mo share/locale/lt/LC_MESSAGES/gedit-2.0.mo share/locale/lv/LC_MESSAGES/gedit-2.0.mo +share/locale/mk/LC_MESSAGES/gedit-2.0.mo +share/locale/mn/LC_MESSAGES/gedit-2.0.mo share/locale/ms/LC_MESSAGES/gedit-2.0.mo share/locale/nl/LC_MESSAGES/gedit-2.0.mo share/locale/nn/LC_MESSAGES/gedit-2.0.mo @@ -106,6 +138,7 @@ share/locale/sk/LC_MESSAGES/gedit-2.0.mo share/locale/sl/LC_MESSAGES/gedit-2.0.mo share/locale/sv/LC_MESSAGES/gedit-2.0.mo share/locale/ta/LC_MESSAGES/gedit-2.0.mo +share/locale/th/LC_MESSAGES/gedit-2.0.mo share/locale/tr/LC_MESSAGES/gedit-2.0.mo share/locale/uk/LC_MESSAGES/gedit-2.0.mo share/locale/vi/LC_MESSAGES/gedit-2.0.mo @@ -113,6 +146,8 @@ share/locale/wa/LC_MESSAGES/gedit-2.0.mo share/locale/zh_CN/LC_MESSAGES/gedit-2.0.mo share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo @dirrm share/gnome/omf/gedit +@dirrm share/gnome/help/gedit/ro/figures +@dirrm share/gnome/help/gedit/ro @dirrm share/gnome/help/gedit/C/figures @dirrm share/gnome/gedit-2/ui @dirrm share/gnome/gedit-2/taglist @@ -132,8 +167,10 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2 @@ -149,8 +186,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers +@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors +@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2 +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index fbac3fb01b4f..ba50055baa69 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,17 +6,16 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.0.6 -PORTREVISION= 2 +PORTVERSION= 2.2.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.0 +MASTER_SITE_SUBDIR= sources/gnome-games/2.2 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ guile.10:${PORTSDIR}/lang/guile USE_BZIP2= yes @@ -37,8 +36,6 @@ post-patch: @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|games\.games|games:games|g ; \ - s|[(]GCONF_CONFIG_SOURCE[)]|(GCONF_SCHEMA_CONFIG_SOURCE)|g' - + 's|games\.games|games:games|g' .include <bsd.port.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 7b08ed8673f0..4b49a8fbb5d0 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.0.6.tar.bz2) = fc6b36ba0d08216a979e8bacbd583532 +MD5 (gnome2/gnome-games-2.2.0.tar.bz2) = 6bcb214c267faa51cfa002b607d87164 diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 2dd61e01ef17..4b820549cadc 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -16,6 +16,8 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml @@ -27,6 +29,8 @@ etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml @@ -324,6 +328,10 @@ share/gnome/help/gnotravex/C/figures/gnotravex_game.png share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png share/gnome/help/gnotravex/C/gnotravex.xml share/gnome/help/gnotravex/C/legal.xml +share/gnome/help/gnotski/C/figures/gnotski_start_window.png +share/gnome/help/gnotski/C/figures/gnotski_win.png +share/gnome/help/gnotski/C/gnotski.xml +share/gnome/help/gnotski/C/legal.xml share/gnome/help/gtali/C/figures/mainwindow.png share/gnome/help/gtali/C/figures/preferences.png share/gnome/help/gtali/C/gtali.xml @@ -377,19 +385,35 @@ share/gnome/help/xbill/C/xbill.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gataxx-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/glines-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnect-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnibbles-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnobots2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnome-stones-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnomine-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnotravex-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnotski-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gtali-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/iagno-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/mahjongg-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/same-gnome-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/xbill-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/cards/backs/beige.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png @@ -428,6 +452,7 @@ share/gnome/pixmaps/gataxx/flipblend.png share/gnome/pixmaps/gataxx/metal.png share/gnome/pixmaps/gataxx/metal2.png share/gnome/pixmaps/gataxx/shrink.png +share/gnome/pixmaps/gataxx/sunmoon.png share/gnome/pixmaps/gataxx/woodtrim.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/ball.png @@ -488,6 +513,7 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title.png share/gnome/pixmaps/gnome-stones/wall.png +share/gnome/pixmaps/gnome-xbill.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png @@ -525,6 +551,7 @@ share/gnome/pixmaps/iagno/flipblend.png share/gnome/pixmaps/iagno/metal.png share/gnome/pixmaps/iagno/metal2.png share/gnome/pixmaps/iagno/shrink.png +share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png share/gnome/pixmaps/mahjongg/bg/bg1.png share/gnome/pixmaps/mahjongg/bg/bg2.png @@ -538,7 +565,6 @@ share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png -share/gnome/pixmaps/xbill.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -710,10 +736,8 @@ share/gnome/xbill/pixmaps/suse.xpm share/gnome/xbill/pixmaps/toaster.xpm share/gnome/xbill/pixmaps/turbolinux.xpm share/gnome/xbill/pixmaps/wingdows.xpm -share/locale/am/LC_MESSAGES/gnome-games.mo -share/locale/ar/LC_MESSAGES/gnome-games.mo -share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo +share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/ca/LC_MESSAGES/gnome-games.mo share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo @@ -727,6 +751,7 @@ share/locale/fi/LC_MESSAGES/gnome-games.mo share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo share/locale/gl/LC_MESSAGES/gnome-games.mo +share/locale/he/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo @@ -768,6 +793,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option @@ -778,10 +805,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gtali @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option @dirrm etc/gconf/gconf.xml.defaults/apps/freecell +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index fbac3fb01b4f..ba50055baa69 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,17 +6,16 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.0.6 -PORTREVISION= 2 +PORTVERSION= 2.2.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.0 +MASTER_SITE_SUBDIR= sources/gnome-games/2.2 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ guile.10:${PORTSDIR}/lang/guile USE_BZIP2= yes @@ -37,8 +36,6 @@ post-patch: @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|games\.games|games:games|g ; \ - s|[(]GCONF_CONFIG_SOURCE[)]|(GCONF_SCHEMA_CONFIG_SOURCE)|g' - + 's|games\.games|games:games|g' .include <bsd.port.mk> diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 7b08ed8673f0..4b49a8fbb5d0 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-games-2.0.6.tar.bz2) = fc6b36ba0d08216a979e8bacbd583532 +MD5 (gnome2/gnome-games-2.2.0.tar.bz2) = 6bcb214c267faa51cfa002b607d87164 diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 2dd61e01ef17..4b820549cadc 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -16,6 +16,8 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol +etc/gconf/gconf.xml.defaults/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/option/%gconf.xml etc/gconf/gconf.xml.defaults/apps/freecell/score/%gconf.xml @@ -27,6 +29,8 @@ etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score/%gconf.xml @@ -324,6 +328,10 @@ share/gnome/help/gnotravex/C/figures/gnotravex_game.png share/gnome/help/gnotravex/C/figures/gnotravex_mainwindow.png share/gnome/help/gnotravex/C/gnotravex.xml share/gnome/help/gnotravex/C/legal.xml +share/gnome/help/gnotski/C/figures/gnotski_start_window.png +share/gnome/help/gnotski/C/figures/gnotski_win.png +share/gnome/help/gnotski/C/gnotski.xml +share/gnome/help/gnotski/C/legal.xml share/gnome/help/gtali/C/figures/mainwindow.png share/gnome/help/gtali/C/figures/preferences.png share/gnome/help/gtali/C/gtali.xml @@ -377,19 +385,35 @@ share/gnome/help/xbill/C/xbill.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gataxx-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/glines-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnect-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnibbles-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnobots2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnome-stones-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnomine-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gnotravex-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-games/gnotski-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/gtali-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/iagno-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/mahjongg-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/same-gnome-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-games/xbill-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/cards/backs/beige.png share/gnome/pixmaps/cards/backs/face.png share/gnome/pixmaps/cards/backs/grey.png @@ -428,6 +452,7 @@ share/gnome/pixmaps/gataxx/flipblend.png share/gnome/pixmaps/gataxx/metal.png share/gnome/pixmaps/gataxx/metal2.png share/gnome/pixmaps/gataxx/shrink.png +share/gnome/pixmaps/gataxx/sunmoon.png share/gnome/pixmaps/gataxx/woodtrim.png share/gnome/pixmaps/glines.png share/gnome/pixmaps/glines/ball.png @@ -488,6 +513,7 @@ share/gnome/pixmaps/gnome-stones/frame.png share/gnome/pixmaps/gnome-stones/gnome.png share/gnome/pixmaps/gnome-stones/title.png share/gnome/pixmaps/gnome-stones/wall.png +share/gnome/pixmaps/gnome-xbill.png share/gnome/pixmaps/gnometris/5blocks-tig.png share/gnome/pixmaps/gnometris/5blocks-tim.png share/gnome/pixmaps/gnometris/5blocks.png @@ -525,6 +551,7 @@ share/gnome/pixmaps/iagno/flipblend.png share/gnome/pixmaps/iagno/metal.png share/gnome/pixmaps/iagno/metal2.png share/gnome/pixmaps/iagno/shrink.png +share/gnome/pixmaps/iagno/sunmoon.png share/gnome/pixmaps/iagno/woodtrim.png share/gnome/pixmaps/mahjongg/bg/bg1.png share/gnome/pixmaps/mahjongg/bg/bg2.png @@ -538,7 +565,6 @@ share/gnome/pixmaps/same-gnome/marbles.png share/gnome/pixmaps/same-gnome/planets.png share/gnome/pixmaps/same-gnome/rotate.png share/gnome/pixmaps/same-gnome/stones.png -share/gnome/pixmaps/xbill.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm share/gnome/sol-games/bakers_dozen.scm @@ -710,10 +736,8 @@ share/gnome/xbill/pixmaps/suse.xpm share/gnome/xbill/pixmaps/toaster.xpm share/gnome/xbill/pixmaps/turbolinux.xpm share/gnome/xbill/pixmaps/wingdows.xpm -share/locale/am/LC_MESSAGES/gnome-games.mo -share/locale/ar/LC_MESSAGES/gnome-games.mo -share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/bg/LC_MESSAGES/gnome-games.mo +share/locale/be/LC_MESSAGES/gnome-games.mo share/locale/ca/LC_MESSAGES/gnome-games.mo share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo @@ -727,6 +751,7 @@ share/locale/fi/LC_MESSAGES/gnome-games.mo share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo share/locale/gl/LC_MESSAGES/gnome-games.mo +share/locale/he/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo @@ -768,6 +793,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/score @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/freecell/option @@ -778,10 +805,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gtali @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/score @dirrm etc/gconf/gconf.xml.defaults/apps/freecell/option @dirrm etc/gconf/gconf.xml.defaults/apps/freecell +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/glines-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnect-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnibbles-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnobots2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnome-stones-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnomine-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotravex-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gnotski-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gtali-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/iagno-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/mahjongg-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/same-gnome-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/xbill-C.omf 2>/dev/null || /usr/bin/true diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile index 15742e824f4e..f2ba7999cbf5 100644 --- a/graphics/eog2/Makefile +++ b/graphics/eog2/Makefile @@ -6,18 +6,18 @@ # PORTNAME= eog2 -PORTVERSION= 1.0.4 +PORTVERSION= 2.2.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DISTNAME= eog-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - gnomeprint-2.0:${PORTSDIR}/print/libgnomeprint \ - rsvg-2.2:${PORTSDIR}/graphics/librsvg2 +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \ + rsvg-2.4:${PORTSDIR}/graphics/librsvg2 USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo index b0ea35e2c45b..fee173ee1497 100644 --- a/graphics/eog2/distinfo +++ b/graphics/eog2/distinfo @@ -1 +1 @@ -MD5 (gnome2/eog-1.0.4.tar.bz2) = f60d5ad2cb208cc18ee8b97868ed925e +MD5 (gnome2/eog-2.2.0.tar.bz2) = e02256bc6837d1366a3aa5df66396dfa diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist index c2a4beb4c2d6..f899a0d2620c 100644 --- a/graphics/eog2/pkg-plist +++ b/graphics/eog2/pkg-plist @@ -11,6 +11,7 @@ etc/gconf/schemas/eog.schemas libdata/bonobo/servers/GNOME_EOG.server libexec/eog-image-viewer share/gnome/applications/eog.desktop +share/gnome/eog/glade/eog.glade share/gnome/gnome-2.0/ui/eog-image-view-ctrl-ui.xml share/gnome/gnome-2.0/ui/eog-image-view-ui.xml share/gnome/gnome-2.0/ui/eog-shell-ui.xml @@ -19,11 +20,13 @@ share/gnome/help/eog/C/figures/eog_start_window.png share/gnome/help/eog/C/legal.xml share/gnome/idl/Eog.idl share/gnome/omf/eog/eog-C.omf +@exec scrollkeeper-install %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/eog/down-right.png share/gnome/pixmaps/eog/orient-horizontal.png share/gnome/pixmaps/eog/orient-vertical.png share/gnome/pixmaps/eog/right-down.png share/gnome/pixmaps/gnome-eog.png +share/locale/am/LC_MESSAGES/eog.mo share/locale/ar/LC_MESSAGES/eog.mo share/locale/az/LC_MESSAGES/eog.mo share/locale/be/LC_MESSAGES/eog.mo @@ -39,11 +42,15 @@ share/locale/fi/LC_MESSAGES/eog.mo share/locale/fr/LC_MESSAGES/eog.mo share/locale/ga/LC_MESSAGES/eog.mo share/locale/gl/LC_MESSAGES/eog.mo +share/locale/he/LC_MESSAGES/eog.mo share/locale/hu/LC_MESSAGES/eog.mo share/locale/it/LC_MESSAGES/eog.mo share/locale/ja/LC_MESSAGES/eog.mo share/locale/ko/LC_MESSAGES/eog.mo share/locale/lt/LC_MESSAGES/eog.mo +share/locale/lv/LC_MESSAGES/eog.mo +share/locale/mk/LC_MESSAGES/eog.mo +share/locale/mn/LC_MESSAGES/eog.mo share/locale/ms/LC_MESSAGES/eog.mo share/locale/nl/LC_MESSAGES/eog.mo share/locale/nn/LC_MESSAGES/eog.mo @@ -66,3 +73,6 @@ share/locale/zh_CN/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/C/figures +@dirrm share/gnome/eog/glade +@dirrm share/gnome/eog +@unexec scrollkeeper-uninstall %D/share/gnome/omf/eog/eog-C.omf 2>/dev/null || /usr/bin/true diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 6ba66e88a5d2..c04ea1863c9b 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.0.5 +PORTVERSION= 2.2.0.1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,14 +23,12 @@ USE_X_PREFIX= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index 852f87a9b5b9..02e97a2a9516 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomecanvas-2.0.5.tar.bz2) = dde3e7ad514acc33d02d7b4144d489c0 +MD5 (gnome2/libgnomecanvas-2.2.0.1.tar.bz2) = c7164feb78aee8c2c9c706fee1289963 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index b3183ba6427d..45b5c96519c3 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,15 +15,19 @@ include/libgnomecanvas-2.0/libgnomecanvas/libgnomecanvas.h lib/libglade/2.0/libcanvas.so lib/libgnomecanvas-2.a lib/libgnomecanvas-2.so -lib/libgnomecanvas-2.so.0 +lib/libgnomecanvas-2.so.200 libdata/pkgconfig/libgnomecanvas-2.0.pc share/doc/libgnomecanvas/c4.html share/doc/libgnomecanvas/index.html share/doc/libgnomecanvas/index.sgml +share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-i18n.html +share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-marshal.html +share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvas.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasbpath.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasclipgroup.html +share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasellipse.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasgroup.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasitem.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasline.html @@ -36,24 +40,29 @@ share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasrichtext.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvasshape.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvastext.html share/doc/libgnomecanvas/libgnomecanvas-gnomecanvaswidget.html +share/doc/libgnomecanvas/libgnomecanvas-libgnomecanvas.html +share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/be/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/bg/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ca/LC_MESSAGES/libgnomecanvas-2.0.mo -share/locale/cs/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/it/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/mn/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ms/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo @@ -61,6 +70,7 @@ share/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ro/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/ru/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 5effe902d47b..de14aae480b3 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.0.1 +PORTVERSION= 2.2.3 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DIST_SUBDIR= gnome2 DISTNAME= librsvg-${PORTVERSION} @@ -19,8 +19,9 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ xml2.5:${PORTSDIR}/textproc/libxml2 \ - gdk_pixbuf-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ + gdk_pixbuf-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \ popt.0:${PORTSDIR}/devel/popt +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libmetal.so:${PORTSDIR}/x11-toolkits/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes @@ -28,16 +29,17 @@ USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes USE_REINPLACE= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +PLIST_SUB= GTK_VERSION="2.2.0" -pre-patch: +MAN1= rsvg.1 + +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ - 's|[(]datadir[)]/gnome/|(datadir)/|g ; \ - s|[(]datadir[)]/locale|(prefix)/share/locale|g ; \ - s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' .include <bsd.port.mk> diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 421c90994e8b..e454f7fb1be4 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1 +1 @@ -MD5 (gnome2/librsvg-2.0.1.tar.bz2) = b4cdeb24049af67a82bb6cd329422364 +MD5 (gnome2/librsvg-2.2.3.tar.bz2) = cdd58f6ce2ce4b5e629501b864f513c2 diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index 90a16992c884..68df08ccb89a 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -1,8 +1,29 @@ +bin/rsvg include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg.h +lib/gtk-2.0/%%GTK_VERSION%%/engines/libsvg.so +lib/gtk-2.0/%%GTK_VERSION%%/loaders/svg_loader.so lib/librsvg-2.a lib/librsvg-2.so -lib/librsvg-2.so.2 +lib/librsvg-2.so.4 libdata/pkgconfig/librsvg-2.0.pc +share/doc/librsvg/html/home.png +share/doc/librsvg/html/i909.html +share/doc/librsvg/html/index.html +share/doc/librsvg/html/index.sgml +share/doc/librsvg/html/left.png +share/doc/librsvg/html/r22.html +share/doc/librsvg/html/r320.html +share/doc/librsvg/html/r354.html +share/doc/librsvg/html/right.png +share/doc/librsvg/html/rsvg-convenience-functions.html +share/doc/librsvg/html/rsvg-core-api.html +share/doc/librsvg/html/rsvg-creating-a-svgz-reader.html +share/doc/librsvg/html/rsvg.html +share/doc/librsvg/html/up.png +@dirrm share/doc/librsvg/html +@dirrm share/doc/librsvg @dirrm include/librsvg-2/librsvg @dirrm include/librsvg-2 +@exec gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true +@unexec gdk-pixbuf-query-loaders > %D/etc/gtk-2.0/gdk-pixbuf.loaders 2>/dev/null || /usr/bin/true diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index f3f9905c93d1..5a83dd5fa647 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnumeric2 -PORTVERSION= 1.1.15 +PORTVERSION= 1.1.16 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.1 @@ -15,10 +15,10 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \ - gal-2-0.2:${PORTSDIR}/x11-toolkits/gal2 \ +LIB_DEPENDS= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \ + gal-2.0.0:${PORTSDIR}/x11-toolkits/gal2 \ gda-2.1:${PORTSDIR}/databases/libgda2 \ - gsf-1.7:${PORTSDIR}/devel/libgsf + gsf-1.8:${PORTSDIR}/devel/libgsf USE_BZIP2= yes USE_X_PREFIX= yes @@ -32,7 +32,7 @@ USE_LIBTOOL= yes CONFIGURE_ARGS= --without-guile --with-bonobo CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \ - DEFS="-I${X11BASE}/include/gal-2-0" + DEFS="-I${X11BASE}/include/gal-2.0" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} PLIST_SUB= VERSION=${PORTVERSION}-bonobo diff --git a/math/gnumeric2/distinfo b/math/gnumeric2/distinfo index 7d5b738b18b8..9e4e8cf952f5 100644 --- a/math/gnumeric2/distinfo +++ b/math/gnumeric2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnumeric-1.1.15.tar.bz2) = d41d9beebefc64d28709f3c665d37603 +MD5 (gnome2/gnumeric-1.1.16.tar.bz2) = 6961bbceafa2a7b2355dbb2a43002919 diff --git a/math/gnumeric2/files/patch-po_de.po b/math/gnumeric2/files/patch-po_de.po new file mode 100644 index 000000000000..437ddbca0403 --- /dev/null +++ b/math/gnumeric2/files/patch-po_de.po @@ -0,0 +1,11 @@ +--- po/de.po.orig Fri Feb 7 01:56:00 2003 ++++ po/de.po Fri Feb 7 02:13:28 2003 +@@ -36,7 +36,7 @@ + "Last-Translator: Christian Neumair <chris@gnome-de.org>\n" + "Language-Team: German <gnome-de@gnome.org>\n" + "MIME-Version: 1.0\n" +-"Content-Type: text/plain; charset=UTF-8\n" ++"Content-Type: text/plain; charset=ISO-8859-1\n" + "Content-Transfer-Encoding: 8bit\n" + + #: GNOME_Gnumeric.server.in.in.h:1 diff --git a/math/gnumeric2/pkg-plist b/math/gnumeric2/pkg-plist index 64dd20257d34..02187948933a 100644 --- a/math/gnumeric2/pkg-plist +++ b/math/gnumeric2/pkg-plist @@ -1,4 +1,6 @@ bin/gnumeric +etc/gconf/gconf.xml.defaults/apps/gnome-settings/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat/%gconf.xml @@ -25,6 +27,8 @@ etc/gconf/gconf.xml.defaults/apps/gnumeric/plugins/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/printing/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnumeric/undo/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat/%gconf.xml @@ -85,6 +89,8 @@ lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.so lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml +lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so +lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc @@ -681,6 +687,7 @@ share/gnome/pixmaps/gnumeric/stock.xpm share/gnome/pixmaps/gnumeric/surface.xpm share/gnome/pixmaps/gnumeric/top_border share/gnome/pixmaps/gnumeric_splash.jpg +share/locale/am/LC_MESSAGES/gnumeric.mo share/locale/bg/LC_MESSAGES/gnumeric.mo share/locale/ca/LC_MESSAGES/gnumeric.mo share/locale/cs/LC_MESSAGES/gnumeric.mo @@ -797,6 +804,8 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autoformat @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric/autocorrect @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnumeric +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings/gnumeric +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-settings @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/undo @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/printsetup @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/printing @@ -823,4 +832,6 @@ share/locale/zh_TW/LC_MESSAGES/gnumeric.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autoformat @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric/autocorrect @dirrm etc/gconf/gconf.xml.defaults/apps/gnumeric +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings/gnumeric +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-settings @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnumeric/gnumeric-C.omf 2>/dev/null || /usr/bin/true diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 9218306a8520..34bd73d61967 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -14,7 +14,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index 354b657e2e78..9ffaa644e6cb 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -76,7 +76,6 @@ share/icons/gnome/48x48/filesystems/gnome-fs-ssh.png share/icons/gnome/48x48/filesystems/gnome-fs-trash-empty.png share/icons/gnome/48x48/filesystems/gnome-fs-trash-full.png share/icons/gnome/48x48/filesystems/gnome-fs-web.png -share/icons/gnome/48x48/mimetypes/gnome-compressed.png share/icons/gnome/48x48/mimetypes/gnome-library.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-msword.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-pdf.png @@ -102,6 +101,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-word.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-arj.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-backup.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-core-file.png diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile index f66cc7612282..d5cd984e99fc 100644 --- a/misc/gnome-user-docs/Makefile +++ b/misc/gnome-user-docs/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile index f66cc7612282..d5cd984e99fc 100644 --- a/misc/gnomeuserdocs2/Makefile +++ b/misc/gnomeuserdocs2/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 3a7c61b84520..94b107947b2e 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.0.7 +PORTVERSION= 2.2.0.3 PORTEPOCH= 1 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.0 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.2 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,9 +29,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -MAN1= archive-generator.1 gnome-calculator.1 \ +MAN1= gnome-calculator.1 \ gnome-character-map.1 gnome-dictionary.1 \ - gnome-search-tool.1 gnome-system-log.1 + gnome-search-tool.1 gnome-system-log.1 gdialog.1 post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo index faead41ee708..c03547bae072 100644 --- a/misc/gnomeutils2/distinfo +++ b/misc/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-utils-2.0.7.tar.bz2) = 84751dc1ccf07c1dd19746404f7dee88 +MD5 (gnome2/gnome-utils-2.2.0.3.tar.bz2) = cef6a3be39d160cf5e2a371293044f7f diff --git a/misc/gnomeutils2/files/patch-configure b/misc/gnomeutils2/files/patch-configure index f562f261364b..d5d7d0e103f2 100644 --- a/misc/gnomeutils2/files/patch-configure +++ b/misc/gnomeutils2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 13 06:31:59 2003 -+++ configure Mon Jan 13 19:40:06 2003 -@@ -10323,7 +10323,7 @@ +--- configure.orig Mon Nov 25 09:25:29 2002 ++++ configure Tue Nov 26 16:04:42 2002 +@@ -10347,7 +10347,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist index 3a44db63e89f..9172619a8a13 100644 --- a/misc/gnomeutils2/pkg-plist +++ b/misc/gnomeutils2/pkg-plist @@ -1,15 +1,17 @@ -bin/archive-generator +bin/gdialog bin/gnome-calculator bin/gnome-character-map bin/gnome-dictionary bin/gnome-search-tool bin/gnome-system-log etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml +etc/gconf/schemas/logview.schemas etc/gconf/schemas/gdict.schemas libdata/bonobo/servers/GNOME_GDictApplet.server libexec/gdict-applet -share/gnome/applications/archive-generator.desktop share/gnome/applications/gnome-calculator.desktop share/gnome/applications/gnome-character-map.desktop share/gnome/applications/gnome-dictionary.desktop @@ -19,43 +21,42 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml share/gnome/gnome-system-log/gnome-system-log-actions.db share/gnome/gnome-system-log/gnome-system-log-descript.db share/gnome/gnome-system-log/gnome-system-log-regexp.db -share/gnome/help/archive-generator/C/archive-generator.xml -share/gnome/help/archive-generator/C/figures/archive-generator-contents.png -share/gnome/help/archive-generator/C/figures/archive-generator.png -share/gnome/help/archive-generator/C/legal.xml +share/gnome/help/gdialog/C/figures/example-dialog.png +share/gnome/help/gdialog/C/figures/gdialog-msgbox.png +share/gnome/help/gdialog/C/figures/gdialog-yesno.png +share/gnome/help/gdialog/C/gdialog.xml +share/gnome/help/gdialog/C/legal.xml share/gnome/help/gnome-calculator/C/figures/gcalc_window.png share/gnome/help/gnome-calculator/C/gnome-calculator.xml share/gnome/help/gnome-calculator/C/legal.xml share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png share/gnome/help/gnome-character-map/C/gnome-character-map.xml share/gnome/help/gnome-character-map/C/legal.xml -share/gnome/help/gnome-dictionary/C/figures/gdict-find.png -share/gnome/help/gnome-dictionary/C/figures/gdict-main.png -share/gnome/help/gnome-dictionary/C/figures/gdict-prefs.png -share/gnome/help/gnome-dictionary/C/figures/gdict-soundex.png -share/gnome/help/gnome-dictionary/C/figures/gdict-spell.png share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png share/gnome/help/gnome-dictionary/C/figures/gdict_window.png share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml share/gnome/help/gnome-dictionary/C/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_advanced.png -share/gnome/help/gnome-search-tool/C/figures/gsearchtool_simple.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml share/gnome/help/gnome-system-log/C/figures/syslog_window.png share/gnome/help/gnome-system-log/C/gnome-system-log.xml share/gnome/help/gnome-system-log/C/legal.xml -share/gnome/omf/gnome-utils/archive-generator-C.omf +share/gnome/omf/gnome-utils/gdialog-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-calculator-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-character-map-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-dictionary-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-search-tool-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-utils/gnome-system-log-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-character-map.png share/gnome/pixmaps/gnome-searchtool.png -share/gnome/pixmaps/gnome-system-log/logview.xpm share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo @@ -74,12 +75,15 @@ share/locale/fi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/fr/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ga/LC_MESSAGES/gnome-utils-2.0.mo share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lt/LC_MESSAGES/gnome-utils-2.0.mo share/locale/lv/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mk/LC_MESSAGES/gnome-utils-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-utils-2.0.mo share/locale/ms/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo @@ -115,9 +119,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-calculator/C/figures @dirrm share/gnome/help/gnome-calculator/C @dirrm share/gnome/help/gnome-calculator -@dirrm share/gnome/help/archive-generator/C/figures -@dirrm share/gnome/help/archive-generator/C -@dirrm share/gnome/help/archive-generator +@dirrm share/gnome/help/gdialog/C/figures +@dirrm share/gnome/help/gdialog/C @dirrm share/gnome/gnome-system-log @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-system-log-C.omf 2>/dev/null || /usr/bin/true diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index 84d52e942e6e..ac8e8a0e38fe 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -16,10 +16,10 @@ DISTNAME= gst-plugins-${PORTVERSION} MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \ gconf-2.5:${PORTSDIR}/devel/gconf2 \ gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \ popt.0:${PORTSDIR}/devel/popt \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile index 84d52e942e6e..ac8e8a0e38fe 100644 --- a/multimedia/gstreamer-plugins80/Makefile +++ b/multimedia/gstreamer-plugins80/Makefile @@ -16,10 +16,10 @@ DISTNAME= gst-plugins-${PORTVERSION} MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \ gconf-2.5:${PORTSDIR}/devel/gconf2 \ gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \ popt.0:${PORTSDIR}/devel/popt \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 46343f66b4a8..d6a3230b3c9a 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \ popt.0:${PORTSDIR}/devel/popt \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -55,7 +55,7 @@ post-install: .include <bsd.port.pre.mk> .if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc) -LIB_DEPENDS+= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS+= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui .endif .include <bsd.port.post.mk> diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile index 46343f66b4a8..d6a3230b3c9a 100644 --- a/multimedia/gstreamer80/Makefile +++ b/multimedia/gstreamer80/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= lioux@FreeBSD.org BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \ popt.0:${PORTSDIR}/devel/popt \ xml2.5:${PORTSDIR}/textproc/libxml2 @@ -55,7 +55,7 @@ post-install: .include <bsd.port.pre.mk> .if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc) -LIB_DEPENDS+= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS+= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui .endif .include <bsd.port.post.mk> diff --git a/net/linc/Makefile b/net/linc/Makefile index 51284d3e01c3..d8cdf751424d 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -6,15 +6,15 @@ # PORTNAME= linc -PORTVERSION= 0.5.5 +PORTVERSION= 1.0.1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.5 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 USE_BZIP2= yes USE_GMAKE= yes diff --git a/net/linc/distinfo b/net/linc/distinfo index f1f62b70d123..629f538b6eda 100644 --- a/net/linc/distinfo +++ b/net/linc/distinfo @@ -1 +1 @@ -MD5 (gnome2/linc-0.5.5.tar.bz2) = 611219ed481b1a891d523a82d82f49e2 +MD5 (gnome2/linc-1.0.1.tar.bz2) = 77f43d6582f695b76fbb5b751a41c9d0 diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 27fd087a1c16..97af30edf9e5 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ggv2 -PORTVERSION= 1.99.97 +PORTVERSION= 1.99.98 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.99 @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu USE_BZIP2= yes diff --git a/print/ggv2/distinfo b/print/ggv2/distinfo index cde882a36136..99ec7ec135d9 100644 --- a/print/ggv2/distinfo +++ b/print/ggv2/distinfo @@ -1 +1 @@ -MD5 (gnome2/ggv-1.99.97.tar.bz2) = 1d0624093f66771231df2353d40ba9c0 +MD5 (gnome2/ggv-1.99.98.tar.bz2) = 98b1b5df0b967ccc8ce395eb1cc0b6bd diff --git a/print/ggv2/files/patch-configure b/print/ggv2/files/patch-configure deleted file mode 100644 index 663ad3ec4027..000000000000 --- a/print/ggv2/files/patch-configure +++ /dev/null @@ -1,17 +0,0 @@ ---- configure.orig Mon Jul 29 16:36:08 2002 -+++ configure Mon Jul 29 21:22:15 2002 -@@ -11833,12 +11833,12 @@ - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - CATOBJEXT=.gmo -- DATADIRNAME=share -+ DATADIRNAME=share/gnome - else - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share/gnome - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index 6aadcfd62538..6629ce03fddc 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -49,6 +49,7 @@ share/locale/fi/LC_MESSAGES/ggv.mo share/locale/fr/LC_MESSAGES/ggv.mo share/locale/ga/LC_MESSAGES/ggv.mo share/locale/gl/LC_MESSAGES/ggv.mo +share/locale/he/LC_MESSAGES/ggv.mo share/locale/hr/LC_MESSAGES/ggv.mo share/locale/hu/LC_MESSAGES/ggv.mo share/locale/it/LC_MESSAGES/ggv.mo @@ -56,6 +57,8 @@ share/locale/ja/LC_MESSAGES/ggv.mo share/locale/ko/LC_MESSAGES/ggv.mo share/locale/lt/LC_MESSAGES/ggv.mo share/locale/lv/LC_MESSAGES/ggv.mo +share/locale/mk/LC_MESSAGES/ggv.mo +share/locale/mn/LC_MESSAGES/ggv.mo share/locale/ms/LC_MESSAGES/ggv.mo share/locale/nl/LC_MESSAGES/ggv.mo share/locale/nn/LC_MESSAGES/ggv.mo diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 843fdc126455..7618cc15344b 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -6,17 +6,17 @@ # PORTNAME= libgnomeprint -PORTVERSION= 1.116.3 +PORTVERSION= 2.2.1.1 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.116 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= bonobo-2.0:${PORTSDIR}/devel/libbonobo \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \ - gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 + gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes @@ -30,6 +30,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +PLIST_SUB= VERSION=${PORTVERSION} + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index 2c67dbea3035..3040a2df7e14 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeprint-1.116.3.tar.bz2) = 1257c22c5d8f68033fa47bc25793f651 +MD5 (gnome2/libgnomeprint-2.2.1.1.tar.bz2) = 21398826672d7d13933448c859892a81 diff --git a/print/libgnomeprint/files/patch-ab b/print/libgnomeprint/files/patch-ab index 0abd2128a5d0..59e59f8282e8 100644 --- a/print/libgnomeprint/files/patch-ab +++ b/print/libgnomeprint/files/patch-ab @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- Makefile.in.orig Mon Jun 10 22:13:33 2002 -+++ Makefile.in Mon Jun 10 22:14:58 2002 -@@ -105,7 +105,7 @@ - WARN_CFLAGS = @WARN_CFLAGS@ +--- Makefile.in.orig Tue Feb 4 00:35:09 2003 ++++ Makefile.in Tue Feb 4 00:36:01 2003 +@@ -135,7 +135,7 @@ + am__quote = @am__quote@ cxxflags_set = @cxxflags_set@ + install_sh = @install_sh@ +-SUBDIRS = libgnomeprint tests data po doc ++SUBDIRS = libgnomeprint data po doc --SUBDIRS = libgnomeprint fonts installer tests data po doc -+SUBDIRS = libgnomeprint fonts installer data po doc - - EXTRA_DIST = message-of-doom ChangeLog ChangeLog.old ChangeLog.old.2 - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + EXTRA_DIST = \ + ChangeLog \ diff --git a/print/libgnomeprint/files/patch-configure b/print/libgnomeprint/files/patch-configure index 0dc458067916..540b06885046 100644 --- a/print/libgnomeprint/files/patch-configure +++ b/print/libgnomeprint/files/patch-configure @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Fri Apr 26 12:49:10 2002 -+++ configure Fri Apr 26 12:49:40 2002 -@@ -5591,6 +5591,7 @@ +--- configure.orig Tue Dec 17 16:29:43 2002 ++++ configure Fri Dec 20 16:33:46 2002 +@@ -8161,6 +8161,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,12 +8,15 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7180,7 +7181,7 @@ - INSTALL_FONTS_TRUE='#' - INSTALL_FONTS_FALSE= - fi --FONTMAPDIR_STATIC=$datadir/gnome/libgnomeprint-2.0/fonts -+FONTMAPDIR_STATIC=$datadir/libgnomeprint-2.0/fonts - FONTMAPDIR_DYNAMIC=$sysconfdir/gnome/libgnomeprint-2.0/fonts +@@ -10938,9 +10939,9 @@ + + if test "x${prefix}" = "xNONE"; then +- GNOME_PRINT_DATA_DIR='${ac_default_prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}' ++ GNOME_PRINT_DATA_DIR='${ac_default_prefix}/share/gnome/libgnomeprint/${VERSION}' + else +- GNOME_PRINT_DATA_DIR='${prefix}/${DATADIRNAME}/libgnomeprint/${VERSION}' ++ GNOME_PRINT_DATA_DIR='${prefix}/share/gnome/libgnomeprint/${VERSION}' + fi + GNOME_PRINT_DATA_DIR=$GNOME_PRINT_DATA_DIR diff --git a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in b/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in deleted file mode 100644 index 10c52a895c03..000000000000 --- a/print/libgnomeprint/files/patch-libgnomeprint::drivers::Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ - -$FreeBSD$ - ---- libgnomeprint/drivers/Makefile.in 2002/03/19 16:44:23 1.1 -+++ libgnomeprint/drivers/Makefile.in 2002/03/19 16:48:12 -@@ -118,13 +118,13 @@ - OMNI2_SRC = gnome-print-omni2.cpp gnome-print-omni2.hpp - OMNI2_LAD = -L$(OMNI_LIBDIR) -lomni - libgnomeprint_omni2_la_SOURCES = $(OMNI2_SRC) --libgnomeprint_omni2_la_LDFLAGS = -version-info 0:0:0 -module -+libgnomeprint_omni2_la_LDFLAGS = -avoid-version -module - libgnomeprint_omni2_la_LIBADD = $(OMNI2_LAD) - - FAX_LIB = libgnomeprint-fax.la - FAX_SRC = gnome-print-fax.c gnome-print-fax.h gnome-print-fax-g3.h - libgnomeprint_fax_la_SOURCES = $(FAX_SRC) --libgnomeprint_fax_la_LDFLAGS = -version-info 0:0:0 -module -+libgnomeprint_fax_la_LDFLAGS = -avoid-version -module - libgnomeprint_fax_la_LIBADD = - - libexecdir = $(libdir)/gnome-print-2.0/drivers diff --git a/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c new file mode 100644 index 000000000000..6aa2b9a4fd79 --- /dev/null +++ b/print/libgnomeprint/files/patch-libgnomeprint_gnome-print.c @@ -0,0 +1,12 @@ +--- libgnomeprint/gnome-print.c.orig Tue Jan 7 14:39:24 2003 ++++ libgnomeprint/gnome-print.c Tue Jan 7 14:39:35 2003 +@@ -38,8 +38,8 @@ + #include <libgnomeprint/gnome-print-frgba.h> + + /* For the buffer stuff, remove when the buffer stuff is moved out here */ +-#include <sys/mman.h> + #include <sys/types.h> ++#include <sys/mman.h> + #include <sys/stat.h> + #include <fcntl.h> + #include <unistd.h> diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index 7a66c932cd43..e60bf212f5aa 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -1,106 +1,114 @@ -bin/libgnomeprint-2.0-font-install etc/gnome/libgnomeprint-2.0/fonts/gnome-print.fontmap -include/libgnomeprint-2.0/libgnomeprint/gnome-font-face.h -include/libgnomeprint-2.0/libgnomeprint/gnome-font.h -include/libgnomeprint-2.0/libgnomeprint/gnome-glyphlist.h -include/libgnomeprint-2.0/libgnomeprint/gnome-pgl.h -include/libgnomeprint-2.0/libgnomeprint/gnome-print-config.h -include/libgnomeprint-2.0/libgnomeprint/gnome-print-master.h -include/libgnomeprint-2.0/libgnomeprint/gnome-print-paper.h -include/libgnomeprint-2.0/libgnomeprint/gnome-print-unit.h -include/libgnomeprint-2.0/libgnomeprint/gnome-print.h -include/libgnomeprint-2.0/libgnomeprint/gnome-rfont.h -include/libgnomeprint-2.0/libgnomeprint/gp-gc.h -include/libgnomeprint-2.0/libgnomeprint/private/gnome-font-private.h -include/libgnomeprint-2.0/libgnomeprint/private/gnome-print-private.h -include/libgnomeprint-2.0/libgnomeprint/private/gp-gc-private.h -include/libgnomeprint-2.0/libgnomeprint/private/gpa-private.h -lib/gnome-print-2.0/drivers/libgnomeprint-fax.so -lib/gnome-print-2.0/transports/libgnomeprint-custom.so -lib/gnome-print-2.0/transports/libgnomeprint-file.so -lib/gnome-print-2.0/transports/libgnomeprint-lpr.so -lib/libgnomeprint-2.a -lib/libgnomeprint-2.so -lib/libgnomeprint-2.so.0 -libdata/pkgconfig/libgnomeprint-2.0.pc -share/doc/libgnomeprint/index.html -share/doc/libgnomeprint/index.sgml -share/doc/libgnomeprint/libgnomeprint-building.html -share/doc/libgnomeprint/libgnomeprint-compiling.html -share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html -share/doc/libgnomeprint/libgnomeprint-gnome-font.html -share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html -share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-master.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html -share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html -share/doc/libgnomeprint/libgnomeprint-gnome-print.html -share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html -share/doc/libgnomeprint/libgnomeprint-question-index.html -share/doc/libgnomeprint/libgnomeprint-resources.html -share/doc/libgnomeprint/libgnomeprint.html -share/doc/libgnomeprint/libgnomeprintunsorted.html -share/gnome/fonts/README.installer -share/gnome/gnome-print-2.0/media/media.xml -share/gnome/gnome-print-2.0/models/GNOME-GENERIC-PS.model -share/gnome/gnome-print-2.0/models/HP-LASERJET-4ML.model -share/gnome/gnome-print-2.0/models/STYLUS-COLOR-740.model -share/gnome/gnome-print-2.0/printers/GENERIC.printer -share/gnome/gnome-print-2.0/vendors/EPSON.vendor -share/gnome/gnome-print-2.0/vendors/GNOME.vendor -share/gnome/gnome-print-2.0/vendors/HP.vendor -share/gnome/libgnomeprint-2.0/fonts/adobe-urw.font -share/gnome/libgnomeprint-2.0/fonts/defaults.fontmap -share/locale/am/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ar/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/az/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/be/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/bg/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ca/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/cs/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/es/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/et/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/fr/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/he/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/hu/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/hi/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/it/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ja/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ko/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/lv/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ms/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/nl/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/nn/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/no/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/pl/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/pt/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ro/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ru/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/sk/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/sl/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/sv/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/ta/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/tr/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/uk/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/vi/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/wa/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.0.mo -share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.0.mo -@dirrm share/gnome/libgnomeprint-2.0/fonts -@dirrm share/gnome/libgnomeprint-2.0 -@dirrm share/gnome/gnome-print-2.0/vendors -@dirrm share/gnome/gnome-print-2.0/printers -@dirrm share/gnome/gnome-print-2.0/models -@dirrm share/gnome/gnome-print-2.0/media -@dirrm share/gnome/gnome-print-2.0 -@dirrm share/doc/libgnomeprint -@dirrm lib/gnome-print-2.0/transports -@dirrm lib/gnome-print-2.0/drivers -@dirrm lib/gnome-print-2.0 -@dirrm include/libgnomeprint-2.0/libgnomeprint/private -@dirrm include/libgnomeprint-2.0/libgnomeprint -@dirrm include/libgnomeprint-2.0 +include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h +include/libgnomeprint-2.2/libgnomeprint/gnome-font.h +include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h +include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h +include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h +include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h +include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h +include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h +include/libgnomeprint-2.2/libgnomeprint/gnome-print.h +include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h +include/libgnomeprint-2.2/libgnomeprint/gp-gc.h +include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-key.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-list.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-model.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-node-private.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-node.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-option.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h +include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h +lib/libgnomeprint-2-2.a +lib/libgnomeprint-2-2.so +lib/libgnomeprint-2-2.so.0 +lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-custom.so +lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-file.so +lib/libgnomeprint/%%VERSION%%/modules/transports/libgnomeprint-lpr.so +libdata/pkgconfig/libgnomeprint-2.2.pc +share/doc/libgnomeprint-2.2/index.html +share/doc/libgnomeprint-2.2/index.sgml +share/doc/libgnomeprint-2.2/libgnomeprint-building.html +share/doc/libgnomeprint-2.2/libgnomeprint-compiling.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-font.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-print.html +share/doc/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html +share/doc/libgnomeprint-2.2/libgnomeprint-resources.html +share/doc/libgnomeprint-2.2/libgnomeprint.html +share/doc/libgnomeprint-2.2/libgnomeprintunsorted.html +share/gnome/libgnomeprint/%%VERSION%%/globals.xml +share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-GENERIC-PS.xml +share/gnome/libgnomeprint/%%VERSION%%/models/GNOME-PDF-WRITER.xml +share/gnome/libgnomeprint/%%VERSION%%/printers/GENERIC.xml +share/gnome/libgnomeprint/%%VERSION%%/printers/PDF-WRITER.xml +share/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/hi/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/pl/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/pt/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/pt_BR/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo +share/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo +@dirrm share/gnome/libgnomeprint/%%VERSION%%/printers +@dirrm share/gnome/libgnomeprint/%%VERSION%%/models +@dirrm share/gnome/libgnomeprint/%%VERSION%% +@dirrm share/gnome/libgnomeprint +@dirrm share/doc/libgnomeprint-2.2 +@dirrm lib/libgnomeprint/%%VERSION%%/modules/transports +@dirrm lib/libgnomeprint/%%VERSION%%/modules +@dirrm lib/libgnomeprint/%%VERSION%% +@dirrm lib/libgnomeprint +@dirrm include/libgnomeprint-2.2/libgnomeprint/private +@dirrm include/libgnomeprint-2.2/libgnomeprint +@dirrm include/libgnomeprint-2.2 @dirrm etc/gnome/libgnomeprint-2.0/fonts @dirrm etc/gnome/libgnomeprint-2.0 diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index 03a2f122998d..bb42196df93e 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gconf-editor -PORTVERSION= 0.3.1 +PORTVERSION= 0.4.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index 63d2a9ba2afc..a3cf91f049bb 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1 +1 @@ -MD5 (gnome2/gconf-editor-0.3.1.tar.bz2) = 2ae3eb95dee36efdc96baf5baa000e96 +MD5 (gnome2/gconf-editor-0.4.0.tar.bz2) = c8e90527fcc899cb3159de1d42ef1dd0 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 12fd78e63810..dd20cd20f952 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -12,8 +12,10 @@ share/gnome/pixmaps/gconf-editor/folder-open.png share/gnome/pixmaps/gconf-editor/stock-about-16.png share/locale/ar/LC_MESSAGES/gconf-editor.mo share/locale/az/LC_MESSAGES/gconf-editor.mo +share/locale/be/LC_MESSAGES/gconf-editor.mo share/locale/bg/LC_MESSAGES/gconf-editor.mo share/locale/ca/LC_MESSAGES/gconf-editor.mo +share/locale/cs/LC_MESSAGES/gconf-editor.mo share/locale/da/LC_MESSAGES/gconf-editor.mo share/locale/de/LC_MESSAGES/gconf-editor.mo share/locale/el/LC_MESSAGES/gconf-editor.mo @@ -32,6 +34,7 @@ share/locale/no/LC_MESSAGES/gconf-editor.mo share/locale/pl/LC_MESSAGES/gconf-editor.mo share/locale/pt/LC_MESSAGES/gconf-editor.mo share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo +share/locale/ro/LC_MESSAGES/gconf-editor.mo share/locale/ru/LC_MESSAGES/gconf-editor.mo share/locale/sk/LC_MESSAGES/gconf-editor.mo share/locale/sl/LC_MESSAGES/gconf-editor.mo diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 6c86e56bdac8..c171fbafba7d 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,16 +6,17 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.0.3.2 +PORTVERSION= 2.2.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.0 +MASTER_SITE_SUBDIR= sources/control-center/2.2 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop +LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \ + metacity-private.0:${PORTSDIR}/x11-wm/metacity USE_BZIP2= yes USE_X_PREFIX= yes @@ -24,6 +25,7 @@ USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier USE_LIBTOOL= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} @@ -31,5 +33,7 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \ + ${WRKSRC}/capplets/font/main.c .include <bsd.port.mk> diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 3a383a0b1e7f..0dbd8f05e367 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-2.0.3.2.tar.bz2) = d359ddd0083cbf88b2511afff859dcfc +MD5 (gnome2/control-center-2.2.0.1.tar.bz2) = b17bc2ecf9a38614310c54c5f88ffc55 diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c index 0969a7707ffd..9c487d7b8e9d 100644 --- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c +++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -1,6 +1,6 @@ ---- capplets/mouse/gnome-mouse-properties.c.orig Wed May 29 00:14:19 2002 -+++ capplets/mouse/gnome-mouse-properties.c Tue Jun 25 21:51:30 2002 -@@ -570,7 +570,7 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Sat Nov 2 13:40:22 2002 ++++ capplets/mouse/gnome-mouse-properties.c Sun Dec 22 16:33:36 2002 +@@ -591,7 +591,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -9,7 +9,7 @@ gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -591,7 +591,7 @@ +@@ -612,7 +612,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -18,7 +18,7 @@ gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -612,7 +612,7 @@ +@@ -633,7 +633,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index f43c53c1ec2b..1f63c8a48e05 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Aug 6 01:33:52 2002 -+++ configure Wed Aug 7 01:22:14 2002 -@@ -5768,6 +5768,7 @@ +--- configure.orig Wed Dec 18 16:10:09 2002 ++++ configure Sun Dec 22 16:36:03 2002 +@@ -8516,6 +8516,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9090,7 +9091,7 @@ - fi +@@ -12607,7 +12608,7 @@ - cat >> confdefs.h <<EOF + + cat >>confdefs.h <<_ACEOF -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" - EOF + _ACEOF GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in new file mode 100644 index 000000000000..49e81252a028 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003 ++++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003 +@@ -195,7 +195,7 @@ + $(GNOME_SETTINGS_DAEMON_LIBS) \ + $(top_builddir)/libbackground/libbackground.la \ + $(top_builddir)/libsounds/libsounds.a \ +- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \ ++ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \ + $(XF86MISC_LIBS) + + diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in new file mode 100644 index 000000000000..d8ece4b307ac --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in @@ -0,0 +1,11 @@ +--- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003 ++++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003 +@@ -151,7 +151,7 @@ + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ + -DG_LOG_DOMAIN=\"capplet-common\" \ + -I$(top_srcdir)/ \ + @CAPPLET_CFLAGS@ diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in new file mode 100644 index 000000000000..c4d9211b70e2 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in @@ -0,0 +1,11 @@ +--- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003 ++++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003 +@@ -151,7 +151,7 @@ + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ + -DG_LOG_DOMAIN=\"capplet-common\" \ + -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \ + -I$(top_srcdir)/ \ diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c new file mode 100644 index 000000000000..149d59a9b0c8 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-libwindow-settings_wm-list.c @@ -0,0 +1,11 @@ +--- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 ++++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 +@@ -251,7 +251,7 @@ + gchar *name; + GConfClient *client; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index ec54a0695607..7619910cb51b 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -10,21 +10,26 @@ bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-settings-daemon bin/gnome-sound-properties -bin/gnome-theme-properties +bin/gnome-theme-manager bin/gnome-ui-properties +bin/gnome-window-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas +etc/gconf/schemas/desktop_gnome_font_rendering.schemas include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server libdata/pkgconfig/gnome-window-settings-2.0.pc share/gnome/applications/gnomecc.desktop @@ -40,6 +45,16 @@ share/gnome/control-center-2.0/capplets/keybinding.desktop share/gnome/control-center-2.0/capplets/keyboard.desktop share/gnome/control-center-2.0/capplets/mouse.desktop share/gnome/control-center-2.0/capplets/sound.desktop +share/gnome/control-center-2.0/capplets/window-properties.desktop +share/gnome/control-center-2.0/icons/accessibility-directory.png +share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png +share/gnome/control-center-2.0/icons/background-capplet.png +share/gnome/control-center-2.0/icons/behavior-capplet.png +share/gnome/control-center-2.0/icons/default-applications-capplet.png +share/gnome/control-center-2.0/icons/font-capplet.png +share/gnome/control-center-2.0/icons/mouse-capplet.png +share/gnome/control-center-2.0/icons/sound-capplet.png +share/gnome/control-center-2.0/icons/window-capplet.png share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade @@ -53,6 +68,7 @@ share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade share/gnome/control-center-2.0/interfaces/sound-properties.glade share/gnome/control-center-2.0/interfaces/theme-install.glade share/gnome/control-center-2.0/interfaces/theme-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png @@ -72,15 +88,18 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png +share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png +share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png +share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png +share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png +share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl -share/gnome/pixmaps/accessibility-directory.png share/gnome/pixmaps/accessibility-keyboard-capplet.png -share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png @@ -94,8 +113,10 @@ share/gnome/pixmaps/keyboard-capplet.png share/gnome/pixmaps/keyboard-shortcut.png share/gnome/pixmaps/mouse-capplet.png share/gnome/pixmaps/sound-capplet.png +share/gnome/pixmaps/window-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo @@ -112,6 +133,7 @@ share/locale/fi/LC_MESSAGES/control-center-2.0.mo share/locale/fr/LC_MESSAGES/control-center-2.0.mo share/locale/ga/LC_MESSAGES/control-center-2.0.mo share/locale/gl/LC_MESSAGES/control-center-2.0.mo +share/locale/he/LC_MESSAGES/control-center-2.0.mo share/locale/hr/LC_MESSAGES/control-center-2.0.mo share/locale/hu/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo @@ -119,6 +141,8 @@ share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo +share/locale/mk/LC_MESSAGES/control-center-2.0.mo +share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo @@ -142,11 +166,15 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces +@dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications +@dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile index 6813c2301de8..5845eb2d971a 100644 --- a/sysutils/gnome-pkgview/Makefile +++ b/sysutils/gnome-pkgview/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.gtnorthern.demon.co.uk/packages/gnome-pkgview/ MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index a59ac239a3f2..83c2ec20a84e 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomesystemmonitor PORTVERSION= 2.0.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0 @@ -15,9 +16,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \ - wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck + wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index f20f766e0951..3dee3013b3f6 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -24,6 +24,7 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/C/legal.xml share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/procman.png share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo @@ -75,3 +76,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo @dirrm etc/gconf/gconf.xml.defaults/apps/procman/memmapstree @dirrm etc/gconf/gconf.xml.defaults/apps/procman/disktree @dirrm etc/gconf/gconf.xml.defaults/apps/procman +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 6c86e56bdac8..c171fbafba7d 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,16 +6,17 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.0.3.2 +PORTVERSION= 2.2.0.1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.0 +MASTER_SITE_SUBDIR= sources/control-center/2.2 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop +LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \ + metacity-private.0:${PORTSDIR}/x11-wm/metacity USE_BZIP2= yes USE_X_PREFIX= yes @@ -24,6 +25,7 @@ USE_GMAKE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier USE_LIBTOOL= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} @@ -31,5 +33,7 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \ + ${WRKSRC}/capplets/font/main.c .include <bsd.port.mk> diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 3a383a0b1e7f..0dbd8f05e367 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (gnome2/control-center-2.0.3.2.tar.bz2) = d359ddd0083cbf88b2511afff859dcfc +MD5 (gnome2/control-center-2.2.0.1.tar.bz2) = b17bc2ecf9a38614310c54c5f88ffc55 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c index 0969a7707ffd..9c487d7b8e9d 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c @@ -1,6 +1,6 @@ ---- capplets/mouse/gnome-mouse-properties.c.orig Wed May 29 00:14:19 2002 -+++ capplets/mouse/gnome-mouse-properties.c Tue Jun 25 21:51:30 2002 -@@ -570,7 +570,7 @@ +--- capplets/mouse/gnome-mouse-properties.c.orig Sat Nov 2 13:40:22 2002 ++++ capplets/mouse/gnome-mouse-properties.c Sun Dec 22 16:33:36 2002 +@@ -591,7 +591,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -9,7 +9,7 @@ gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -591,7 +591,7 @@ +@@ -612,7 +612,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @@ -18,7 +18,7 @@ gtk_list_store_append (GTK_LIST_STORE (model), &iter); if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -612,7 +612,7 @@ +@@ -633,7 +633,7 @@ filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL); pixbuf = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index f43c53c1ec2b..1f63c8a48e05 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Aug 6 01:33:52 2002 -+++ configure Wed Aug 7 01:22:14 2002 -@@ -5768,6 +5768,7 @@ +--- configure.orig Wed Dec 18 16:10:09 2002 ++++ configure Sun Dec 22 16:36:03 2002 +@@ -8516,6 +8516,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9090,7 +9091,7 @@ - fi +@@ -12607,7 +12608,7 @@ - cat >> confdefs.h <<EOF + + cat >>confdefs.h <<_ACEOF -#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}" +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" - EOF + _ACEOF GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in new file mode 100644 index 000000000000..49e81252a028 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/Makefile.in.orig Fri Jan 17 12:30:39 2003 ++++ gnome-settings-daemon/Makefile.in Fri Jan 17 12:33:06 2003 +@@ -195,7 +195,7 @@ + $(GNOME_SETTINGS_DAEMON_LIBS) \ + $(top_builddir)/libbackground/libbackground.la \ + $(top_builddir)/libsounds/libsounds.a \ +- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings \ ++ -L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings \ + $(XF86MISC_LIBS) + + diff --git a/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in new file mode 100644 index 000000000000..d8ece4b307ac --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-libbackground_Makefile.in @@ -0,0 +1,11 @@ +--- libbackground/Makefile.in.orig Fri Jan 17 12:33:42 2003 ++++ libbackground/Makefile.in Fri Jan 17 12:34:13 2003 +@@ -151,7 +151,7 @@ + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ + -DG_LOG_DOMAIN=\"capplet-common\" \ + -I$(top_srcdir)/ \ + @CAPPLET_CFLAGS@ diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in new file mode 100644 index 000000000000..c4d9211b70e2 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_Makefile.in @@ -0,0 +1,11 @@ +--- libwindow-settings/Makefile.in.orig Fri Jan 17 12:34:44 2003 ++++ libwindow-settings/Makefile.in Fri Jan 17 12:35:43 2003 +@@ -151,7 +151,7 @@ + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ + -DG_LOG_DOMAIN=\"capplet-common\" \ + -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \ + -I$(top_srcdir)/ \ diff --git a/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c new file mode 100644 index 000000000000..149d59a9b0c8 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-libwindow-settings_wm-list.c @@ -0,0 +1,11 @@ +--- libwindow-settings/wm-list.c.orig Tue Oct 8 17:43:12 2002 ++++ libwindow-settings/wm-list.c Tue Oct 8 17:43:25 2002 +@@ -251,7 +251,7 @@ + gchar *name; + GConfClient *client; + +- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/"); ++ tempdir = gnome_unconditional_datadir_file ("wm-properties/"); + wm_list_read_dir (tempdir, FALSE); + g_free (tempdir); + diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index ec54a0695607..7619910cb51b 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -10,21 +10,26 @@ bin/gnome-mouse-properties bin/gnome-network-preferences bin/gnome-settings-daemon bin/gnome-sound-properties -bin/gnome-theme-properties +bin/gnome-theme-manager bin/gnome-ui-properties +bin/gnome-window-properties etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas +etc/gconf/schemas/desktop_gnome_font_rendering.schemas include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server libdata/pkgconfig/gnome-window-settings-2.0.pc share/gnome/applications/gnomecc.desktop @@ -40,6 +45,16 @@ share/gnome/control-center-2.0/capplets/keybinding.desktop share/gnome/control-center-2.0/capplets/keyboard.desktop share/gnome/control-center-2.0/capplets/mouse.desktop share/gnome/control-center-2.0/capplets/sound.desktop +share/gnome/control-center-2.0/capplets/window-properties.desktop +share/gnome/control-center-2.0/icons/accessibility-directory.png +share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png +share/gnome/control-center-2.0/icons/background-capplet.png +share/gnome/control-center-2.0/icons/behavior-capplet.png +share/gnome/control-center-2.0/icons/default-applications-capplet.png +share/gnome/control-center-2.0/icons/font-capplet.png +share/gnome/control-center-2.0/icons/mouse-capplet.png +share/gnome/control-center-2.0/icons/sound-capplet.png +share/gnome/control-center-2.0/icons/window-capplet.png share/gnome/control-center-2.0/interfaces/background-properties.glade share/gnome/control-center-2.0/interfaces/file-types-properties.glade share/gnome/control-center-2.0/interfaces/font-properties.glade @@ -53,6 +68,7 @@ share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade share/gnome/control-center-2.0/interfaces/sound-properties.glade share/gnome/control-center-2.0/interfaces/theme-install.glade share/gnome/control-center-2.0/interfaces/theme-properties.glade +share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png @@ -72,15 +88,18 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png share/gnome/control-center-2.0/pixmaps/mouse-left.png share/gnome/control-center-2.0/pixmaps/mouse-right.png +share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png +share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png +share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png +share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png +share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png share/gnome/cursor-fonts/cursor-large-white.pcf share/gnome/cursor-fonts/cursor-large.pcf share/gnome/cursor-fonts/cursor-white.pcf share/gnome/gnome-2.0/ui/gnomecc-ui.xml share/gnome/idl/ConfigArchiver.idl share/gnome/idl/GNOME_SettingsDaemon.idl -share/gnome/pixmaps/accessibility-directory.png share/gnome/pixmaps/accessibility-keyboard-capplet.png -share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/background-capplet.png share/gnome/pixmaps/behavior-capplet.png share/gnome/pixmaps/control-center2.png @@ -94,8 +113,10 @@ share/gnome/pixmaps/keyboard-capplet.png share/gnome/pixmaps/keyboard-shortcut.png share/gnome/pixmaps/mouse-capplet.png share/gnome/pixmaps/sound-capplet.png +share/gnome/pixmaps/window-capplet.png share/gnome/vfolders/Accessibility.directory share/gnome/vfolders/Advanced.directory +share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo share/locale/az/LC_MESSAGES/control-center-2.0.mo share/locale/be/LC_MESSAGES/control-center-2.0.mo @@ -112,6 +133,7 @@ share/locale/fi/LC_MESSAGES/control-center-2.0.mo share/locale/fr/LC_MESSAGES/control-center-2.0.mo share/locale/ga/LC_MESSAGES/control-center-2.0.mo share/locale/gl/LC_MESSAGES/control-center-2.0.mo +share/locale/he/LC_MESSAGES/control-center-2.0.mo share/locale/hr/LC_MESSAGES/control-center-2.0.mo share/locale/hu/LC_MESSAGES/control-center-2.0.mo share/locale/it/LC_MESSAGES/control-center-2.0.mo @@ -119,6 +141,8 @@ share/locale/ja/LC_MESSAGES/control-center-2.0.mo share/locale/ko/LC_MESSAGES/control-center-2.0.mo share/locale/lt/LC_MESSAGES/control-center-2.0.mo share/locale/lv/LC_MESSAGES/control-center-2.0.mo +share/locale/mk/LC_MESSAGES/control-center-2.0.mo +share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo @@ -142,11 +166,15 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces +@dirrm share/gnome/control-center-2.0/icons @dirrm share/gnome/applications +@dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index a59ac239a3f2..83c2ec20a84e 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnomesystemmonitor PORTVERSION= 2.0.4 +PORTREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.0 @@ -15,9 +16,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \ - wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck + wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index f20f766e0951..3dee3013b3f6 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -24,6 +24,7 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml share/gnome/help/gnome-system-monitor/C/legal.xml share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/procman.png share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo @@ -75,3 +76,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo @dirrm etc/gconf/gconf.xml.defaults/apps/procman/memmapstree @dirrm etc/gconf/gconf.xml.defaults/apps/procman/disktree @dirrm etc/gconf/gconf.xml.defaults/apps/procman +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf 2>/dev/null || /usr/bin/true diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index e86a3248ea32..29cc490b3661 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgtkhtml -PORTVERSION= 2.0.3 +PORTVERSION= 2.2.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/www/libgtkhtml/distinfo b/www/libgtkhtml/distinfo index 3a7e25ddb2b8..8bba09c720df 100644 --- a/www/libgtkhtml/distinfo +++ b/www/libgtkhtml/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgtkhtml-2.0.3.tar.bz2) = 692e789c4d1679f495d9a76ea4db420f +MD5 (gnome2/libgtkhtml-2.2.0.tar.bz2) = 55681a938ed9f8ae121f38556d36e9a6 diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index dd11ea83ff2f..19f4320c36dd 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,20 +6,19 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTVERSION= 2.2.0.2 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DIST_SUBDIR= gnome2 DISTNAME= nautilus-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 -LIB_DEPENDS= rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \ - eel-2.2:${PORTSDIR}/x11-toolkits/eel2 \ - gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop +LIB_DEPENDS= rsvg-2.4:${PORTSDIR}/graphics/librsvg2 \ + eel-2.4:${PORTSDIR}/x11-toolkits/eel2 \ + gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop RUN_DEPENDS= gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 USE_BZIP2= yes diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index abb2cd1fec6c..57ec11cc5d25 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1 +1 @@ -MD5 (gnome2/nautilus-2.0.8.tar.bz2) = 761bed97624070aa29cca64fd56842b1 +MD5 (gnome2/nautilus-2.2.0.2.tar.bz2) = 27538efc26c651edf21d71ae0c81f9cf diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index e09fa7ef2f7b..7fe0bcd6e288 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Sep 14 16:54:42 2002 -+++ Makefile.in Sat Sep 14 16:55:17 2002 -@@ -161,7 +161,6 @@ +--- Makefile.in.orig Tue Jan 7 12:28:34 2003 ++++ Makefile.in Tue Jan 7 12:29:48 2003 +@@ -153,7 +153,6 @@ libnautilus-private \ libnautilus-adapter \ src \ diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index e3791b9336ea..bff0e4a65988 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Jul 23 21:46:17 2002 -+++ configure Tue Jul 23 21:49:20 2002 -@@ -8311,6 +8311,7 @@ +--- configure.orig Mon Jan 13 10:45:25 2003 ++++ configure Tue Jan 14 13:11:53 2003 +@@ -8294,6 +8294,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,7 +8,7 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -13383,7 +13384,7 @@ +@@ -12661,7 +12662,7 @@ LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" @@ -17,7 +17,7 @@ CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" -@@ -13391,7 +13392,7 @@ +@@ -12669,7 +12670,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" @@ -26,19 +26,16 @@ COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0" -@@ -14291,9 +14292,9 @@ - s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t - s,@ORBIT_IDL@,$ORBIT_IDL,;t t - s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t --s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t -+s~@ORBIT_LIBS@~$ORBIT_LIBS~;t t +@@ -13593,7 +13594,7 @@ + s,@LIBTOOL@,$LIBTOOL,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t -s,@ALL_LIBS@,$ALL_LIBS,;t t +s~@ALL_LIBS@~$ALL_LIBS~;t t s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t s,@ALLOCA@,$ALLOCA,;t t s,@USE_NLS@,$USE_NLS,;t t -@@ -14345,24 +14346,24 @@ +@@ -13643,25 +13644,25 @@ s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t s,@HAVE_JW@,$HAVE_JW,;t t s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t @@ -46,6 +43,7 @@ +s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t s,@LIBJPEG@,$LIBJPEG,;t t s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t + s,@LIBEGG_CFLAGS@,$LIBEGG_CFLAGS,;t t s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t -s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t +s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t @@ -57,9 +55,8 @@ s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t -s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t +s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t - s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t --s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t -+s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t + s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t + s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in new file mode 100644 index 000000000000..835db34742aa --- /dev/null +++ b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in @@ -0,0 +1,11 @@ +--- libbackground/Makefile.in.orig Tue Jan 7 12:30:18 2003 ++++ libbackground/Makefile.in Tue Jan 7 12:30:58 2003 +@@ -141,7 +141,7 @@ + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +- -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ ++ -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" \ + -DG_LOG_DOMAIN=\"capplet-common\" \ + -I$(top_srcdir)/ \ + @CAPPLET_CFLAGS@ diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c new file mode 100644 index 000000000000..2d67d65e74db --- /dev/null +++ b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-emblem-utils.c @@ -0,0 +1,10 @@ +--- libnautilus-private/nautilus-emblem-utils.c.orig Mon Oct 14 22:20:28 2002 ++++ libnautilus-private/nautilus-emblem-utils.c Mon Oct 14 22:20:56 2002 +@@ -24,6 +24,7 @@ + + #include <config.h> + ++#include <sys/types.h> + #include <utime.h> + #include <stdio.h> + #include <time.h> diff --git a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-thumbnails.c b/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-thumbnails.c deleted file mode 100644 index e84dc83e280f..000000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-private_nautilus-thumbnails.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libnautilus-private/nautilus-thumbnails.c.orig Tue Jul 9 19:09:29 2002 -+++ libnautilus-private/nautilus-thumbnails.c Tue Jul 9 19:09:19 2002 -@@ -309,6 +309,7 @@ - pthread_attr_init (&thread_attributes); - pthread_attr_setdetachstate (&thread_attributes, - PTHREAD_CREATE_DETACHED); -+ pthread_attr_setstacksize (&thread_attributes, 128*1024); - #ifdef DEBUG_THUMBNAILS - g_message ("(Main Thread) Creating thumbnails thread\n"); - #endif diff --git a/x11-fm/nautilus2/files/patch-temp b/x11-fm/nautilus2/files/patch-temp deleted file mode 100644 index 35155bcfd86b..000000000000 --- a/x11-fm/nautilus2/files/patch-temp +++ /dev/null @@ -1,121 +0,0 @@ - -Fixes problem with Nautilus not sensing available desktop space and therefore -placing icons under the panel. Reverses rev.179-1.180 of -src/file-manager/fm-desktop-icon-view.c. Will go away when gnomepanel is -teached to set _NET_WORKAREA properly. - ---- src/file-manager/fm-desktop-icon-view.c.orig Mon Jul 22 21:03:46 2002 -+++ src/file-manager/fm-desktop-icon-view.c Wed Jul 24 22:47:32 2002 -@@ -148,39 +148,9 @@ - } - - static void --icon_container_set_workarea (NautilusIconContainer *icon_container, -- long *workareas, -- int n_items) --{ -- int left, right, top, bottom; -- int screen_width, screen_height; -- int i; -- -- left = right = top = bottom = 0; -- -- screen_width = gdk_screen_width (); -- screen_height = gdk_screen_height (); -- -- for (i = 0; i < n_items; i += 4) { -- int x = workareas [i]; -- int y = workareas [i + 1]; -- int width = workareas [i + 2]; -- int height = workareas [i + 3]; -- -- left = MAX (left, x); -- right = MAX (right, screen_width - width - x); -- top = MAX (top, y); -- bottom = MAX (bottom, screen_height - height - y); -- } -- -- nautilus_icon_container_set_margins (icon_container, -- left, right, top, bottom); --} -- --static void - net_workarea_changed (FMDesktopIconView *icon_view) - { -- long *workareas = NULL; -+ long *borders = NULL; - Atom type_returned; - int format_returned; - unsigned long items_returned; -@@ -194,33 +164,38 @@ - gdk_error_trap_push (); - if (XGetWindowProperty (GDK_DISPLAY (), - GDK_ROOT_WINDOW (), -- gdk_x11_get_xatom_by_name ("_NET_WORKAREA"), -- 0, G_MAXLONG, False, -+ gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA"), -+ 0 /* long_offset */, -+ 4 /* long_length */, -+ False /* delete */, - XA_CARDINAL, - &type_returned, - &format_returned, - &items_returned, - &bytes_after_return, -- (unsigned char **)&workareas) != Success) { -- if (workareas != NULL) -- XFree (workareas); -- workareas = NULL; -+ (unsigned char **)&borders) != Success) { -+ if (borders != NULL) -+ XFree (borders); -+ borders = NULL; - } - - if (gdk_error_trap_pop () -- || workareas == NULL -+ || borders == NULL - || type_returned != XA_CARDINAL -- || (items_returned % 4) != 0 -+ || items_returned != 4 - || format_returned != 32) { - nautilus_icon_container_set_margins (icon_container, - 0, 0, 0, 0); - } else { -- icon_container_set_workarea ( -- icon_container, workareas, items_returned); -+ nautilus_icon_container_set_margins (icon_container, -+ borders[0 /* left */], -+ borders[1 /* right */], -+ borders[2 /* top */], -+ borders[3 /* bottom */]); - } - -- if (workareas != NULL) -- XFree (workareas); -+ if (borders != NULL) -+ XFree (borders); - } - - static GdkFilterReturn -@@ -235,8 +210,9 @@ - - switch (xevent->type) { - case PropertyNotify: -- if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("_NET_WORKAREA")) -+ if (xevent->xproperty.atom == gdk_x11_get_xatom_by_name ("GNOME_PANEL_DESKTOP_AREA")) { - net_workarea_changed (icon_view); -+ } - break; - default: - break; -@@ -708,7 +684,8 @@ - default_zoom_level_changed (desktop_icon_view); - fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view); - -- /* Read out the workarea geometry and update the icon container accordingly */ -+ /* Read out the panel desktop area and update the icon container -+ * accordingly */ - net_workarea_changed (desktop_icon_view); - - /* Setup the property filter */ diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index f87d1cefa1de..448120b204aa 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -1,4 +1,6 @@ bin/nautilus +bin/nautilus-file-management-properties +bin/nautilus-server-connect etc/X11/serverconfig/.directory etc/X11/starthere/.directory etc/X11/starthere/applications.desktop @@ -9,14 +11,12 @@ etc/X11/sysconfig/.directory etc/gconf/gconf.xml.defaults/apps/nautilus/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/list_view/%gconf.xml -etc/gconf/gconf.xml.defaults/apps/nautilus/news/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/%gconf.xml etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view/%gconf.xml -etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree/%gconf.xml @@ -31,7 +31,9 @@ include/libnautilus/nautilus-undo.h include/libnautilus/nautilus-view-component.h include/libnautilus/nautilus-view-standard-main.h include/libnautilus/nautilus-view.h +lib/bonobo/libnautilus-emblem-view.so lib/bonobo/libnautilus-history-view.so +lib/bonobo/libnautilus-image-properties-view.so lib/bonobo/libnautilus-notes-view.so lib/bonobo/libnautilus-tree-view.so lib/libnautilus-adapter.a @@ -45,61 +47,33 @@ lib/libnautilus.so lib/libnautilus.so.2 libdata/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server libdata/bonobo/servers/Nautilus_Control_throbber.server -libdata/bonobo/servers/Nautilus_View_content-loser.server +libdata/bonobo/servers/Nautilus_View_emblem.server libdata/bonobo/servers/Nautilus_View_history.server -libdata/bonobo/servers/Nautilus_View_music.server +libdata/bonobo/servers/Nautilus_View_image_properties.server libdata/bonobo/servers/Nautilus_View_notes.server -libdata/bonobo/servers/Nautilus_View_sample.server -libdata/bonobo/servers/Nautilus_View_sidebar-loser.server libdata/bonobo/servers/Nautilus_View_text.server libdata/bonobo/servers/Nautilus_View_tree.server libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus.pc libexec/nautilus-adapter -libexec/nautilus-content-loser -libexec/nautilus-music-view -libexec/nautilus-sample-content-view -libexec/nautilus-sidebar-loser libexec/nautilus-text-view libexec/nautilus-throbber share/gnome/applications/nautilus.desktop +share/gnome/applications/nautilus-file-management-properties.desktop +share/gnome/applications/network-scheme.desktop share/gnome/gnome-2.0/ui/nautilus-clipboard-ui.xml -share/gnome/gnome-2.0/ui/nautilus-content-loser-ui.xml share/gnome/gnome-2.0/ui/nautilus-desktop-icon-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-directory-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-icon-view-ui.xml -share/gnome/gnome-2.0/ui/nautilus-sample-content-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-search-list-view-ui.xml share/gnome/gnome-2.0/ui/nautilus-shell-ui.xml -share/gnome/gnome-2.0/ui/nautilus-sidebar-loser-ui.xml share/gnome/idl/nautilus-distributed-undo.idl share/gnome/idl/nautilus-view-component.idl share/gnome/nautilus/browser.xml -share/gnome/nautilus/emblems/OK.png -share/gnome/nautilus/emblems/art.png -share/gnome/nautilus/emblems/camera.png -share/gnome/nautilus/emblems/certified.png -share/gnome/nautilus/emblems/cool.png -share/gnome/nautilus/emblems/danger.png -share/gnome/nautilus/emblems/distinguished.png -share/gnome/nautilus/emblems/documents.png -share/gnome/nautilus/emblems/draft.png -share/gnome/nautilus/emblems/erase.png -share/gnome/nautilus/emblems/favorite.png -share/gnome/nautilus/emblems/important.png -share/gnome/nautilus/emblems/mail.png -share/gnome/nautilus/emblems/multimedia.png -share/gnome/nautilus/emblems/new.png -share/gnome/nautilus/emblems/ohno.png -share/gnome/nautilus/emblems/package.png -share/gnome/nautilus/emblems/personal.png -share/gnome/nautilus/emblems/pictures.png -share/gnome/nautilus/emblems/sound.png -share/gnome/nautilus/emblems/special.png -share/gnome/nautilus/emblems/urgent.png -share/gnome/nautilus/emblems/web.png share/gnome/nautilus/filesystem-attributes.xml share/gnome/nautilus/glade/nautilus-bookmarks-window.glade +share/gnome/nautilus/glade/nautilus-file-management-properties.glade +share/gnome/nautilus/glade/nautilus-server-connect.glade share/gnome/nautilus/nautilus-extras.placeholder share/gnome/nautilus/nautilus-suggested.placeholder share/gnome/nautilus/patterns/.striated.png @@ -139,8 +113,8 @@ share/gnome/nautilus/services/text/webster.xml share/gnome/nautilus/starthere-link.desktop share/gnome/nautilus/starthere.desktop share/gnome/nautilus/static_bookmarks.xml -share/gnome/pixmaps/gnome-starthere-96.png -share/gnome/pixmaps/gnome-starthere.png +share/gnome/network/nautilus-server-connect.desktop +share/gnome/pixmaps/nautilus/nautilus-desktop.png share/gnome/pixmaps/nautilus/CD_drive.png share/gnome/pixmaps/nautilus/HD_drive.png share/gnome/pixmaps/nautilus/Search.png @@ -150,46 +124,12 @@ share/gnome/pixmaps/nautilus/chit_frame.png share/gnome/pixmaps/nautilus/colors.png share/gnome/pixmaps/nautilus/cpu.png share/gnome/pixmaps/nautilus/crux_eggplant/Search.png -share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/background_pattern.png -share/gnome/pixmaps/nautilus/crux_eggplant/backgrounds/window_pattern.png share/gnome/pixmaps/nautilus/crux_eggplant/crux_eggplant.xml share/gnome/pixmaps/nautilus/crux_eggplant/decrement-i.png share/gnome/pixmaps/nautilus/crux_eggplant/decrement.png -share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/emblem-nowrite.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-12.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-192.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-20.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-24.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-36.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-72.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory-96.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.png -share/gnome/pixmaps/nautilus/crux_eggplant/i-directory.xml -share/gnome/pixmaps/nautilus/crux_eggplant/i-regular.xml share/gnome/pixmaps/nautilus/crux_eggplant/increment-i.png share/gnome/pixmaps/nautilus/crux_eggplant/increment.png share/gnome/pixmaps/nautilus/crux_eggplant/number_strip.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-active-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-active.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-empty-space.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/fill.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-active-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-active.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/left-bumper.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-normal-normal.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-normal-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/middle-prelight-normal.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-bumper-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-bumper.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-empty-space.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-active-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-active.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top-prelight.png -share/gnome/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/right-top.png share/gnome/pixmaps/nautilus/crux_eggplant/theme_preview.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/001.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/002.png @@ -224,54 +164,12 @@ share/gnome/pixmaps/nautilus/crux_eggplant/throbber/030.png share/gnome/pixmaps/nautilus/crux_eggplant/throbber/rest.png share/gnome/pixmaps/nautilus/crux_eggplant/zoom_body.png share/gnome/pixmaps/nautilus/crux_teal/Search.png -share/gnome/pixmaps/nautilus/crux_teal/backgrounds/background_pattern.png -share/gnome/pixmaps/nautilus/crux_teal/backgrounds/window_pattern.png share/gnome/pixmaps/nautilus/crux_teal/crux_teal.xml share/gnome/pixmaps/nautilus/crux_teal/decrement-i.png share/gnome/pixmaps/nautilus/crux_teal/decrement.png -share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-72.png -share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite-96.png -share/gnome/pixmaps/nautilus/crux_teal/emblem-nowrite.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-12.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-192.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-20.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-24.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-36.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-72.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory-96.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory.png -share/gnome/pixmaps/nautilus/crux_teal/i-directory.xml -share/gnome/pixmaps/nautilus/crux_teal/i-regular-12.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-192.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-20.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-24.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-36.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-72.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular-96.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular.png -share/gnome/pixmaps/nautilus/crux_teal/i-regular.xml share/gnome/pixmaps/nautilus/crux_teal/increment-i.png share/gnome/pixmaps/nautilus/crux_teal/increment.png share/gnome/pixmaps/nautilus/crux_teal/number_strip.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-active.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-empty-space.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/fill.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-active.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/left-bumper.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-normal.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-normal-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/middle-prelight-normal.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-bumper.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-empty-space.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-active.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top-prelight.png -share/gnome/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/right-top.png share/gnome/pixmaps/nautilus/crux_teal/theme_preview.png share/gnome/pixmaps/nautilus/crux_teal/throbber/001.png share/gnome/pixmaps/nautilus/crux_teal/throbber/002.png @@ -309,134 +207,15 @@ share/gnome/pixmaps/nautilus/decrement.png share/gnome/pixmaps/nautilus/default/Search.png share/gnome/pixmaps/nautilus/default/decrement.png share/gnome/pixmaps/nautilus/default/default.xml -share/gnome/pixmaps/nautilus/default/desktop-home.png -share/gnome/pixmaps/nautilus/default/emblem-OK.svg -share/gnome/pixmaps/nautilus/default/emblem-art.png -share/gnome/pixmaps/nautilus/default/emblem-broken-link.png -share/gnome/pixmaps/nautilus/default/emblem-camera.png -share/gnome/pixmaps/nautilus/default/emblem-certified.svg -share/gnome/pixmaps/nautilus/default/emblem-cool.svg -share/gnome/pixmaps/nautilus/default/emblem-danger.svg -share/gnome/pixmaps/nautilus/default/emblem-distinguished.svg -share/gnome/pixmaps/nautilus/default/emblem-documents.png -share/gnome/pixmaps/nautilus/default/emblem-draft.svg -share/gnome/pixmaps/nautilus/default/emblem-favorite.svg -share/gnome/pixmaps/nautilus/default/emblem-generic.png -share/gnome/pixmaps/nautilus/default/emblem-important.svg -share/gnome/pixmaps/nautilus/default/emblem-mail.png -share/gnome/pixmaps/nautilus/default/emblem-multimedia.png -share/gnome/pixmaps/nautilus/default/emblem-new.svg -share/gnome/pixmaps/nautilus/default/emblem-noread.svg -share/gnome/pixmaps/nautilus/default/emblem-nowrite.svg -share/gnome/pixmaps/nautilus/default/emblem-ohno.svg -share/gnome/pixmaps/nautilus/default/emblem-package.png -share/gnome/pixmaps/nautilus/default/emblem-personal.svg -share/gnome/pixmaps/nautilus/default/emblem-pictures.png -share/gnome/pixmaps/nautilus/default/emblem-sound.png -share/gnome/pixmaps/nautilus/default/emblem-special.svg -share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-12.png -share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-24.png -share/gnome/pixmaps/nautilus/default/emblem-symbolic-link-36.png -share/gnome/pixmaps/nautilus/default/emblem-symbolic-link.png -share/gnome/pixmaps/nautilus/default/emblem-trash.png -share/gnome/pixmaps/nautilus/default/emblem-urgent.svg -share/gnome/pixmaps/nautilus/default/emblem-web.png -share/gnome/pixmaps/nautilus/default/i-bookmark-20.png -share/gnome/pixmaps/nautilus/default/i-bookmark-missing-20.png -share/gnome/pixmaps/nautilus/default/i-bookmark-missing.png -share/gnome/pixmaps/nautilus/default/i-bookmark.png -share/gnome/pixmaps/nautilus/default/i-broken-image.png -share/gnome/pixmaps/nautilus/default/i-directory-12.png -share/gnome/pixmaps/nautilus/default/i-directory-24.png -share/gnome/pixmaps/nautilus/default/i-directory-36.png -share/gnome/pixmaps/nautilus/default/i-directory-72.png -share/gnome/pixmaps/nautilus/default/i-directory-96.png -share/gnome/pixmaps/nautilus/default/i-directory-accept-12.png -share/gnome/pixmaps/nautilus/default/i-directory-accept-24.png -share/gnome/pixmaps/nautilus/default/i-directory-accept-36.png -share/gnome/pixmaps/nautilus/default/i-directory-accept-72.png -share/gnome/pixmaps/nautilus/default/i-directory-accept-96.png -share/gnome/pixmaps/nautilus/default/i-directory-accept.png -share/gnome/pixmaps/nautilus/default/i-directory-accept.xml -share/gnome/pixmaps/nautilus/default/i-directory.png -share/gnome/pixmaps/nautilus/default/i-directory.xml -share/gnome/pixmaps/nautilus/default/i-regular-12.png -share/gnome/pixmaps/nautilus/default/i-regular-24.png -share/gnome/pixmaps/nautilus/default/i-regular-36.png -share/gnome/pixmaps/nautilus/default/i-regular-72.png -share/gnome/pixmaps/nautilus/default/i-regular-96.png -share/gnome/pixmaps/nautilus/default/i-regular.png -share/gnome/pixmaps/nautilus/default/i-regular.xml -share/gnome/pixmaps/nautilus/default/i-search-72.png -share/gnome/pixmaps/nautilus/default/i-spreadsheet.png -share/gnome/pixmaps/nautilus/default/i-stalled.png -share/gnome/pixmaps/nautilus/default/i-symlink.png -share/gnome/pixmaps/nautilus/default/i-web-72.png share/gnome/pixmaps/nautilus/default/increment.png -share/gnome/pixmaps/nautilus/default/loading.png -share/gnome/pixmaps/nautilus/default/manual.png share/gnome/pixmaps/nautilus/default/number_strip.png share/gnome/pixmaps/nautilus/default/side_bar_image.png share/gnome/pixmaps/nautilus/default/theme_preview.png -share/gnome/pixmaps/nautilus/default/trash-empty.png -share/gnome/pixmaps/nautilus/default/trash-full.png -share/gnome/pixmaps/nautilus/default/trash-empty-192.png -share/gnome/pixmaps/nautilus/default/trash-full-192.png share/gnome/pixmaps/nautilus/default/zoom_body.png share/gnome/pixmaps/nautilus/emblems.png +share/gnome/pixmaps/nautilus/erase.png share/gnome/pixmaps/nautilus/gnome/Services.png -share/gnome/pixmaps/nautilus/gnome/application-x-e-cfg.png -share/gnome/pixmaps/nautilus/gnome/audio-192.png -share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-72.png -share/gnome/pixmaps/nautilus/gnome/emblem-nowrite-96.png -share/gnome/pixmaps/nautilus/gnome/emblem-nowrite.png share/gnome/pixmaps/nautilus/gnome/gnome.xml -share/gnome/pixmaps/nautilus/gnome/i-core.png -share/gnome/pixmaps/nautilus/gnome/i-dirclosed.png -share/gnome/pixmaps/nautilus/gnome/i-directory-12.png -share/gnome/pixmaps/nautilus/gnome/i-directory-192.png -share/gnome/pixmaps/nautilus/gnome/i-directory-20.png -share/gnome/pixmaps/nautilus/gnome/i-directory-24.png -share/gnome/pixmaps/nautilus/gnome/i-directory-36.png -share/gnome/pixmaps/nautilus/gnome/i-directory-72.png -share/gnome/pixmaps/nautilus/gnome/i-directory-96.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-12.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-192.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-20.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-24.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-36.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-72.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept-96.png -share/gnome/pixmaps/nautilus/gnome/i-directory-accept.png -share/gnome/pixmaps/nautilus/gnome/i-directory.png -share/gnome/pixmaps/nautilus/gnome/i-executable.png -share/gnome/pixmaps/nautilus/gnome/i-music-192.png -share/gnome/pixmaps/nautilus/gnome/i-music.png -share/gnome/pixmaps/nautilus/gnome/i-nfs.png -share/gnome/pixmaps/nautilus/gnome/i-regular.png -share/gnome/pixmaps/nautilus/gnome/i-regular.xml -share/gnome/pixmaps/nautilus/gnome/i-stalled.png -share/gnome/pixmaps/nautilus/gnome/linux-penguin.png -share/gnome/pixmaps/nautilus/gnome/rpm-directory.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-active.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-empty-space.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/fill.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-active.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/left-bumper.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-normal.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-normal-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/middle-prelight-normal.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-bumper.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-empty-space.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-active.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top-prelight.png -share/gnome/pixmaps/nautilus/gnome/sidebar_tab_pieces/right-top.png share/gnome/pixmaps/nautilus/gnome/theme_preview.png share/gnome/pixmaps/nautilus/gnome/throbber/001.png share/gnome/pixmaps/nautilus/gnome/throbber/002.png @@ -445,70 +224,20 @@ share/gnome/pixmaps/nautilus/gnome/throbber/004.png share/gnome/pixmaps/nautilus/gnome/throbber/005.png share/gnome/pixmaps/nautilus/gnome/throbber/006.png share/gnome/pixmaps/nautilus/gnome/throbber/rest.png -share/gnome/pixmaps/nautilus/gnome/trash-empty-192.png -share/gnome/pixmaps/nautilus/gnome/trash-empty-accept-192.png -share/gnome/pixmaps/nautilus/gnome/trash-empty-accept.png -share/gnome/pixmaps/nautilus/gnome/trash-empty.png -share/gnome/pixmaps/nautilus/gnome/trash-full-192.png -share/gnome/pixmaps/nautilus/gnome/trash-full.png share/gnome/pixmaps/nautilus/increment.png share/gnome/pixmaps/nautilus/knob.png share/gnome/pixmaps/nautilus/memory_chip.gif share/gnome/pixmaps/nautilus/nautilus-launch-icon.png share/gnome/pixmaps/nautilus/nautilus-mini-logo.png +share/gnome/pixmaps/nautilus/nautilus-server-connect.png share/gnome/pixmaps/nautilus/note-indicator.png share/gnome/pixmaps/nautilus/number_strip.png -share/gnome/pixmaps/nautilus/side_bar_image.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-active-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-active.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-empty-space.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/fill.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-active-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-active.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/left-bumper.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-normal-normal.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-normal-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/middle-prelight-normal.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-bumper-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-bumper.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-empty-space.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-active.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top-prelight.png -share/gnome/pixmaps/nautilus/sidebar_tab_pieces/right-top.png -share/gnome/pixmaps/nautilus/sierra/Sierra_desktop.png share/gnome/pixmaps/nautilus/sierra/green_weave.png -share/gnome/pixmaps/nautilus/sierra/i-directory-12.png -share/gnome/pixmaps/nautilus/sierra/i-directory-24.png -share/gnome/pixmaps/nautilus/sierra/i-directory-36.png -share/gnome/pixmaps/nautilus/sierra/i-directory-72.png -share/gnome/pixmaps/nautilus/sierra/i-directory-96.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept-12.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept-24.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept-36.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept-72.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept-96.png -share/gnome/pixmaps/nautilus/sierra/i-directory-accept.png -share/gnome/pixmaps/nautilus/sierra/i-directory.png share/gnome/pixmaps/nautilus/sierra/number_strip.png share/gnome/pixmaps/nautilus/sierra/sierra.xml share/gnome/pixmaps/nautilus/sierra/theme_preview.png -share/gnome/pixmaps/nautilus/tahoe/blueridge.png +share/gnome/pixmaps/nautilus/side_bar_image.png share/gnome/pixmaps/nautilus/tahoe/bluewall.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-12.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-24.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-36.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-72.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-96.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-12.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-24.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-36.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-72.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept-96.png -share/gnome/pixmaps/nautilus/tahoe/i-directory-accept.png -share/gnome/pixmaps/nautilus/tahoe/i-directory.png share/gnome/pixmaps/nautilus/tahoe/number_strip.png share/gnome/pixmaps/nautilus/tahoe/tahoe.xml share/gnome/pixmaps/nautilus/tahoe/theme_preview.png @@ -547,6 +276,7 @@ share/gnome/pixmaps/nautilus/throbber/rest.png share/gnome/pixmaps/nautilus/thumbnail_frame.png share/gnome/pixmaps/nautilus/zoom_body.png share/locale/am/LC_MESSAGES/nautilus.mo +share/locale/ar/LC_MESSAGES/nautilus.mo share/locale/az/LC_MESSAGES/nautilus.mo share/locale/be/LC_MESSAGES/nautilus.mo share/locale/bg/LC_MESSAGES/nautilus.mo @@ -563,12 +293,16 @@ share/locale/fi/LC_MESSAGES/nautilus.mo share/locale/fr/LC_MESSAGES/nautilus.mo share/locale/ga/LC_MESSAGES/nautilus.mo share/locale/gl/LC_MESSAGES/nautilus.mo +share/locale/he/LC_MESSAGES/nautilus.mo +share/locale/hi/LC_MESSAGES/nautilus.mo share/locale/hu/LC_MESSAGES/nautilus.mo share/locale/it/LC_MESSAGES/nautilus.mo share/locale/ja/LC_MESSAGES/nautilus.mo share/locale/ko/LC_MESSAGES/nautilus.mo share/locale/lt/LC_MESSAGES/nautilus.mo share/locale/lv/LC_MESSAGES/nautilus.mo +share/locale/mk/LC_MESSAGES/nautilus.mo +share/locale/mn/LC_MESSAGES/nautilus.mo share/locale/ms/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/nn/LC_MESSAGES/nautilus.mo @@ -589,18 +323,17 @@ share/locale/vi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/default +@dirrm share/gnome/network @dirrm share/gnome/nautilus/glade @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels/tree @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/sidebar_panels @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/preferences -@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/news @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/list_view @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus/icon_view @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels/tree @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/sidebar_panels @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/preferences -@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/news @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/list_view @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus/icon_view @dirrm etc/gconf/gconf.xml.defaults/apps/nautilus diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index d08a560c30f3..2c0841063dab 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -6,15 +6,17 @@ # PORTNAME= gnome-themes -PORTVERSION= 1.0 +PORTVERSION= 2.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine +LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 682cebb1ffc4..a0b32f0fe100 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-themes-1.0.tar.bz2) = fd9f0cc87edfa7c8d9e04293f72f131d +MD5 (gnome2/gnome-themes-2.2.tar.bz2) = 18f9b8cea0469bf2ae934024c6f4fa9d diff --git a/x11-themes/gnome-themes/files/patch-configure b/x11-themes/gnome-themes/files/patch-configure new file mode 100644 index 000000000000..8afd3d20e32f --- /dev/null +++ b/x11-themes/gnome-themes/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Mon Feb 3 20:16:09 2003 ++++ configure Mon Feb 3 20:16:31 2003 +@@ -7640,6 +7640,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in new file mode 100644 index 000000000000..02365472fd62 --- /dev/null +++ b/x11-themes/gnome-themes/files/patch-metacity-themes_Makefile.in @@ -0,0 +1,11 @@ +--- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003 ++++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003 +@@ -120,7 +120,7 @@ + THEMES = Mist Sandwish Smokey + + +-THEME_DIR = $(datadir)/themes ++THEME_DIR = $(datadir)/gnome/themes + THEME_SUBDIR = metacity-1 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 6a2667b67616..f69543fe3d6f 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -1,3 +1,241 @@ +lib/gtk-2.0/2.2.0/engines/libcrux-engine.so +lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so +lib/gtk-2.0/2.2.0/engines/libmist.so +share/eazel-engine/arrow_down-spinner.png +share/eazel-engine/arrow_down.png +share/eazel-engine/arrow_left.png +share/eazel-engine/arrow_right.png +share/eazel-engine/arrow_up-spinner.png +share/eazel-engine/arrow_up.png +share/eazel-engine/check-active-default-focus.png +share/eazel-engine/check-active-default.png +share/eazel-engine/check-active-hilight-focus.png +share/eazel-engine/check-active-hilight.png +share/eazel-engine/check-active-insensitive.png +share/eazel-engine/check-active-pressed-focus.png +share/eazel-engine/check-active-pressed.png +share/eazel-engine/check-default-focus.png +share/eazel-engine/check-default.png +share/eazel-engine/check-hilight-focus.png +share/eazel-engine/check-hilight.png +share/eazel-engine/check-insensitive.png +share/eazel-engine/check-pressed-focus.png +share/eazel-engine/check-pressed.png +share/eazel-engine/progressbar-left.png +share/eazel-engine/progressbar-right.png +share/eazel-engine/progressbar.png +share/eazel-engine/progressbar_trough.png +share/eazel-engine/radio-active-default-focus.png +share/eazel-engine/radio-active-default.png +share/eazel-engine/radio-active-hilight-focus.png +share/eazel-engine/radio-active-hilight.png +share/eazel-engine/radio-active-insensitive.png +share/eazel-engine/radio-active-pressed-focus.png +share/eazel-engine/radio-active-pressed.png +share/eazel-engine/radio-default-focus.png +share/eazel-engine/radio-default.png +share/eazel-engine/radio-hilight-focus.png +share/eazel-engine/radio-hilight.png +share/eazel-engine/radio-insensitive.png +share/eazel-engine/radio-pressed-focus.png +share/eazel-engine/radio-pressed.png +share/eazel-engine/scroller-arrow-down-hilight.png +share/eazel-engine/scroller-arrow-down-pressed.png +share/eazel-engine/scroller-arrow-down.png +share/eazel-engine/scroller-arrow-left-hilight.png +share/eazel-engine/scroller-arrow-left-pressed.png +share/eazel-engine/scroller-arrow-left.png +share/eazel-engine/scroller-arrow-right-hilight.png +share/eazel-engine/scroller-arrow-right-pressed.png +share/eazel-engine/scroller-arrow-right.png +share/eazel-engine/scroller-arrow-up-hilight.png +share/eazel-engine/scroller-arrow-up-pressed.png +share/eazel-engine/scroller-arrow-up.png +share/eazel-engine/scroller-h-hilight.png +share/eazel-engine/scroller-h-thumb-hilight.png +share/eazel-engine/scroller-h-thumb.png +share/eazel-engine/scroller-h-trough.png +share/eazel-engine/scroller-h.png +share/eazel-engine/scroller-v-hilight.png +share/eazel-engine/scroller-v-thumb-hilight.png +share/eazel-engine/scroller-v-thumb.png +share/eazel-engine/scroller-v-trough.png +share/eazel-engine/scroller-v.png +share/eazel-engine/slider_h_thumb.png +share/eazel-engine/slider_h_trough.png +share/eazel-engine/slider_h_trough_focus.png +share/eazel-engine/slider_v_thumb.png +share/eazel-engine/slider_v_trough.png +share/eazel-engine/slider_v_trough_focus.png +share/eazel-engine/tab_left-unsel.png +share/eazel-engine/tab_left.png +share/eazel-engine/tab_right.png +share/eazel-engine/tab_sel-bottom.png +share/eazel-engine/tab_sel.png +share/eazel-engine/tab_usel-bottom-left.png +share/eazel-engine/tab_usel-bottom.png +share/eazel-engine/tab_usel-left.png +share/eazel-engine/tab_usel.png +share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml +share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-border-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-left-corner.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-right-corner.png +share/gnome/themes/Sandwish/metacity-1/active-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/active-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/active-button.png +share/gnome/themes/Sandwish/metacity-1/active-close-button.png +share/gnome/themes/Sandwish/metacity-1/active-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-left-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/active-left-top-border.png +share/gnome/themes/Sandwish/metacity-1/active-maximize-button.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button.png +share/gnome/themes/Sandwish/metacity-1/active-minimize-button.png +share/gnome/themes/Sandwish/metacity-1/active-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-right-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/active-right-top-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-left.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-left.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-right.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-right.png +share/gnome/themes/Sandwish/metacity-1/active-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-left-corner.png +share/gnome/themes/Sandwish/metacity-1/active-top-mid-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-mid-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-right-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-border-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-border-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-mid-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/inactive-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/inactive-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-close-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-maximize-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-minimize-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-left.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-mid.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-right.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-left-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-mid-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-right-corner.png +share/gnome/themes/Sandwish/metacity-1/metacity-theme-1.xml +share/gnome/themes/Smokey/metacity-1/button-base.png +share/gnome/themes/Smokey/metacity-1/button-pressed-shine.png +share/gnome/themes/Smokey/metacity-1/button-pressed.png +share/gnome/themes/Smokey/metacity-1/button-shine.png +share/gnome/themes/Smokey/metacity-1/close.png +share/gnome/themes/Smokey/metacity-1/maximize.png +share/gnome/themes/Smokey/metacity-1/metacity-theme-1.xml +share/gnome/themes/Smokey/metacity-1/minimize.png +share/gnome/themes/Smokey/metacity-1/stripes.png +share/icons/Crux/12x12/filesystems/gnome-fs-directory.png +share/icons/Crux/12x12/filesystems/gnome-fs-regular.png +share/icons/Crux/192x192/filesystems/gnome-fs-directory.png +share/icons/Crux/192x192/filesystems/gnome-fs-regular.png +share/icons/Crux/20x20/filesystems/gnome-fs-directory.png +share/icons/Crux/20x20/filesystems/gnome-fs-regular.png +share/icons/Crux/24x24/filesystems/gnome-fs-directory.png +share/icons/Crux/24x24/filesystems/gnome-fs-regular.png +share/icons/Crux/36x36/filesystems/gnome-fs-directory.png +share/icons/Crux/36x36/filesystems/gnome-fs-regular.png +share/icons/Crux/48x48/emblems/emblem-nowrite.png +share/icons/Crux/48x48/filesystems/gnome-fs-directory.png +share/icons/Crux/48x48/filesystems/gnome-fs-regular.png +share/icons/Crux/72x72/emblems/emblem-nowrite.png +share/icons/Crux/72x72/filesystems/gnome-fs-directory.png +share/icons/Crux/72x72/filesystems/gnome-fs-regular.png +share/icons/Crux/96x96/emblems/emblem-nowrite.png +share/icons/Crux/96x96/filesystems/gnome-fs-directory.png +share/icons/Crux/96x96/filesystems/gnome-fs-regular.png +share/icons/Crux/index.theme +share/icons/Flat-Blue/12x12/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-empty.png +share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-full.png +share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark-missing.png +share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark.png +share/icons/Flat-Blue/24x24/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/36x36/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-broken-image.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-spreadsheet.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-stalled.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-symlink.png +share/icons/Flat-Blue/48x48/emblems/emblem-art.png +share/icons/Flat-Blue/48x48/emblems/emblem-broken-link.png +share/icons/Flat-Blue/48x48/emblems/emblem-camera.png +share/icons/Flat-Blue/48x48/emblems/emblem-documents.png +share/icons/Flat-Blue/48x48/emblems/emblem-generic.png +share/icons/Flat-Blue/48x48/emblems/emblem-mail.png +share/icons/Flat-Blue/48x48/emblems/emblem-multimedia.png +share/icons/Flat-Blue/48x48/emblems/emblem-package.png +share/icons/Flat-Blue/48x48/emblems/emblem-pictures.png +share/icons/Flat-Blue/48x48/emblems/emblem-sound.png +share/icons/Flat-Blue/48x48/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/48x48/emblems/emblem-trash.png +share/icons/Flat-Blue/48x48/emblems/emblem-web.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark-missing.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-home.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-loading.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Flat-Blue/72x72/devices/gnome-dev-search.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-web.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/index.theme +share/icons/Flat-Blue/scalable/emblems/emblem-OK.svg +share/icons/Flat-Blue/scalable/emblems/emblem-certified.svg +share/icons/Flat-Blue/scalable/emblems/emblem-cool.svg +share/icons/Flat-Blue/scalable/emblems/emblem-danger.svg +share/icons/Flat-Blue/scalable/emblems/emblem-distinguished.svg +share/icons/Flat-Blue/scalable/emblems/emblem-draft.svg +share/icons/Flat-Blue/scalable/emblems/emblem-favorite.svg +share/icons/Flat-Blue/scalable/emblems/emblem-important.svg +share/icons/Flat-Blue/scalable/emblems/emblem-new.svg +share/icons/Flat-Blue/scalable/emblems/emblem-noread.svg +share/icons/Flat-Blue/scalable/emblems/emblem-nowrite.svg +share/icons/Flat-Blue/scalable/emblems/emblem-ohno.svg +share/icons/Flat-Blue/scalable/emblems/emblem-personal.svg +share/icons/Flat-Blue/scalable/emblems/emblem-special.svg +share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png @@ -652,12 +890,84 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png share/icons/LowContrastLargePrint/index.theme +share/icons/Sandy/12x12/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/12x12/filesystems/gnome-fs-directory.png +share/icons/Sandy/24x24/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/24x24/filesystems/gnome-fs-directory.png +share/icons/Sandy/36x36/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/36x36/filesystems/gnome-fs-directory.png +share/icons/Sandy/48x48/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/48x48/filesystems/gnome-fs-directory.png +share/icons/Sandy/72x72/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/72x72/filesystems/gnome-fs-directory.png +share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png +share/icons/Sandy/index.theme +share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-72.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-96.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty-accept.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full-accept.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Smokey-Blue/index.theme +share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-72.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-96.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Smokey-Red/index.theme +share/themes/Crux/gtk-2.0/gtkrc +share/themes/Crux/index.theme +share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_all_prelight.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_prelight.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_prelight.png +share/themes/Grand-Canyon/gtk-2.0/arrow_down.png +share/themes/Grand-Canyon/gtk-2.0/arrow_left.png +share/themes/Grand-Canyon/gtk-2.0/arrow_null.png +share/themes/Grand-Canyon/gtk-2.0/arrow_right.png +share/themes/Grand-Canyon/gtk-2.0/arrow_sub.png +share/themes/Grand-Canyon/gtk-2.0/arrow_up.png +share/themes/Grand-Canyon/gtk-2.0/blank.png +share/themes/Grand-Canyon/gtk-2.0/button_default.png +share/themes/Grand-Canyon/gtk-2.0/check2.png +share/themes/Grand-Canyon/gtk-2.0/entry1.png +share/themes/Grand-Canyon/gtk-2.0/gtkrc +share/themes/Grand-Canyon/gtk-2.0/gtkrc.pants +share/themes/Grand-Canyon/gtk-2.0/hline.png +share/themes/Grand-Canyon/gtk-2.0/htrough.png +share/themes/Grand-Canyon/gtk-2.0/in.png +share/themes/Grand-Canyon/gtk-2.0/menu_shadow.png +share/themes/Grand-Canyon/gtk-2.0/minus.png +share/themes/Grand-Canyon/gtk-2.0/mradio1.png +share/themes/Grand-Canyon/gtk-2.0/mradio2.png +share/themes/Grand-Canyon/gtk-2.0/notebook_bottom_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_left_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_right_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_top_flat.png +share/themes/Grand-Canyon/gtk-2.0/option_menu.png +share/themes/Grand-Canyon/gtk-2.0/plus.png +share/themes/Grand-Canyon/gtk-2.0/radio2.png +share/themes/Grand-Canyon/gtk-2.0/vtrough.png +share/themes/Grand-Canyon/index.theme share/themes/HighContrast/gtk-2.0/gtkrc share/themes/HighContrast/index.theme share/themes/HighContrastInverse/gtk-2.0/gtkrc share/themes/HighContrastInverse/index.theme share/themes/HighContrastLargePrint/gtk-2.0/gtkrc -share/themes/HighContrastLargePrint/index.theme +share/themes/HighContrastLargePrint/index.theme~ share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrint/pixmaps/double-click-off.png share/themes/HighContrastLargePrint/pixmaps/double-click-on.png @@ -790,7 +1100,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png share/themes/HighContrastLargePrint/pixmaps/volume-mute.png share/themes/HighContrastLargePrint/pixmaps/volume-zero.png share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc -share/themes/HighContrastLargePrintInverse/index.theme +share/themes/HighContrastLargePrintInverse/index.theme~ share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png @@ -1055,10 +1365,11 @@ share/themes/LargePrint/pixmaps/volume-medium.png share/themes/LargePrint/pixmaps/volume-min.png share/themes/LargePrint/pixmaps/volume-mute.png share/themes/LargePrint/pixmaps/volume-zero.png +share/themes/LighthouseBlue/gtk-2.0/gtkrc share/themes/LowContrast/gtk-2.0/gtkrc -share/themes/LowContrast/index.theme +share/themes/LowContrast/index.theme~ share/themes/LowContrastLargePrint/gtk-2.0/gtkrc -share/themes/LowContrastLargePrint/index.theme +share/themes/LowContrastLargePrint/index.theme~ share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png share/themes/LowContrastLargePrint/pixmaps/double-click-off.png share/themes/LowContrastLargePrint/pixmaps/double-click-on.png @@ -1190,11 +1501,50 @@ share/themes/LowContrastLargePrint/pixmaps/volume-medium.png share/themes/LowContrastLargePrint/pixmaps/volume-min.png share/themes/LowContrastLargePrint/pixmaps/volume-mute.png share/themes/LowContrastLargePrint/pixmaps/volume-zero.png +share/themes/Mist/gtk-2.0/gtkrc +share/themes/Mist/index.theme +share/themes/Ocean-Dream/index.theme +share/themes/Simple/gtk-2.0/gtkrc +share/themes/Simple/index.theme +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-prelight.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-pressed.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-sb.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue.png +share/themes/Smokey-Blue/gtk-2.0/bubble-grey.png +share/themes/Smokey-Blue/gtk-2.0/check1.png +share/themes/Smokey-Blue/gtk-2.0/check2.png +share/themes/Smokey-Blue/gtk-2.0/gtkrc +share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue1.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey1.png +share/themes/Smokey-Blue/gtk-2.0/lines_background.png +share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png +share/themes/Smokey-Blue/gtk-2.0/option1.png +share/themes/Smokey-Blue/gtk-2.0/option2.png +share/themes/Smokey-Blue/index.theme +share/themes/Traditional/index.theme +@dirrm share/themes/Traditional +@dirrm share/themes/Smokey-Blue/gtk-2.0 +@dirrm share/themes/Smokey-Blue +@dirrm share/themes/Simple/gtk-2.0 +@dirrm share/themes/Simple +@dirrm share/themes/Ocean-Dream +@dirrm share/themes/Mist/gtk-2.0 +@dirrm share/themes/Mist @dirrm share/themes/LowContrastLargePrint/pixmaps @dirrm share/themes/LowContrastLargePrint/gtk-2.0 @dirrm share/themes/LowContrastLargePrint @dirrm share/themes/LowContrast/gtk-2.0 @dirrm share/themes/LowContrast +@dirrm share/themes/LighthouseBlue/gtk-2.0 +@dirrm share/themes/LighthouseBlue @dirrm share/themes/LargePrint/pixmaps @dirrm share/themes/LargePrint/gtk-2.0 @dirrm share/themes/LargePrint @@ -1208,6 +1558,31 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png @dirrm share/themes/HighContrastInverse @dirrm share/themes/HighContrast/gtk-2.0 @dirrm share/themes/HighContrast +@dirrm share/themes/Grand-Canyon/gtk-2.0 +@dirrm share/themes/Grand-Canyon +@dirrm share/themes/Crux/gtk-2.0 +@dirrm share/themes/Crux +@dirrm share/icons/Smokey-Red/48x48/filesystems +@dirrm share/icons/Smokey-Red/48x48/emblems +@dirrm share/icons/Smokey-Red/48x48 +@dirrm share/icons/Smokey-Red +@dirrm share/icons/Smokey-Blue/48x48/filesystems +@dirrm share/icons/Smokey-Blue/48x48/emblems +@dirrm share/icons/Smokey-Blue/48x48 +@dirrm share/icons/Smokey-Blue +@dirrm share/icons/Sandy/96x96/filesystems +@dirrm share/icons/Sandy/96x96 +@dirrm share/icons/Sandy/72x72/filesystems +@dirrm share/icons/Sandy/72x72 +@dirrm share/icons/Sandy/48x48/filesystems +@dirrm share/icons/Sandy/48x48 +@dirrm share/icons/Sandy/36x36/filesystems +@dirrm share/icons/Sandy/36x36 +@dirrm share/icons/Sandy/24x24/filesystems +@dirrm share/icons/Sandy/24x24 +@dirrm share/icons/Sandy/12x12/filesystems +@dirrm share/icons/Sandy/12x12 +@dirrm share/icons/Sandy @dirrm share/icons/LowContrastLargePrint/48x48/mimetypes @dirrm share/icons/LowContrastLargePrint/48x48/filesystems @dirrm share/icons/LowContrastLargePrint/48x48/emblems @@ -1233,4 +1608,56 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png @dirrm share/icons/HighContrastLargePrint @dirrm share/icons/HighContrastInverse @dirrm share/icons/HighContrast +@dirrm share/icons/Flat-Blue/scalable/emblems +@dirrm share/icons/Flat-Blue/scalable +@dirrm share/icons/Flat-Blue/96x96/filesystems +@dirrm share/icons/Flat-Blue/96x96 +@dirrm share/icons/Flat-Blue/72x72/filesystems +@dirrm share/icons/Flat-Blue/72x72/devices +@dirrm share/icons/Flat-Blue/72x72 +@dirrm share/icons/Flat-Blue/48x48/filesystems +@dirrm share/icons/Flat-Blue/48x48/emblems +@dirrm share/icons/Flat-Blue/48x48/devices +@dirrm share/icons/Flat-Blue/48x48 +@dirrm share/icons/Flat-Blue/36x36/filesystems +@dirrm share/icons/Flat-Blue/36x36/emblems +@dirrm share/icons/Flat-Blue/36x36 +@dirrm share/icons/Flat-Blue/24x24/filesystems +@dirrm share/icons/Flat-Blue/24x24/emblems +@dirrm share/icons/Flat-Blue/24x24 +@dirrm share/icons/Flat-Blue/20x20/filesystems +@dirrm share/icons/Flat-Blue/20x20 +@dirrm share/icons/Flat-Blue/192x192/filesystems +@dirrm share/icons/Flat-Blue/192x192 +@dirrm share/icons/Flat-Blue/12x12/filesystems +@dirrm share/icons/Flat-Blue/12x12/emblems +@dirrm share/icons/Flat-Blue/12x12 +@dirrm share/icons/Flat-Blue +@dirrm share/icons/Crux/96x96/filesystems +@dirrm share/icons/Crux/96x96/emblems +@dirrm share/icons/Crux/96x96 +@dirrm share/icons/Crux/72x72/filesystems +@dirrm share/icons/Crux/72x72/emblems +@dirrm share/icons/Crux/72x72 +@dirrm share/icons/Crux/48x48/filesystems +@dirrm share/icons/Crux/48x48/emblems +@dirrm share/icons/Crux/48x48 +@dirrm share/icons/Crux/36x36/filesystems +@dirrm share/icons/Crux/36x36 +@dirrm share/icons/Crux/24x24/filesystems +@dirrm share/icons/Crux/24x24 +@dirrm share/icons/Crux/20x20/filesystems +@dirrm share/icons/Crux/20x20 +@dirrm share/icons/Crux/192x192/filesystems +@dirrm share/icons/Crux/192x192 +@dirrm share/icons/Crux/12x12/filesystems +@dirrm share/icons/Crux/12x12 +@dirrm share/icons/Crux +@dirrm share/gnome/themes/Smokey/metacity-1 +@dirrm share/gnome/themes/Smokey +@dirrm share/gnome/themes/Sandwish/metacity-1 +@dirrm share/gnome/themes/Sandwish +@dirrm share/gnome/themes/Mist/metacity-1 +@dirrm share/gnome/themes/Mist +@dirrm share/eazel-engine @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index c0142e498200..649e67dcae87 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -6,22 +6,24 @@ # PORTNAME= gtk-engines2 -PORTVERSION= 1.9.0 +PORTVERSION= 2.2.0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gtk-engines/1.9 -DISTNAME= gtk-engines-${PORTVERSION} +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -PLIST_SUB= VERSION=2.0.0 +PLIST_SUB= VERSION=2.2.0 THEMES= metal redmond95 diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index a025fd2ab81a..6e6b48e93ec1 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk-engines-1.9.0.tar.bz2) = d77b10a9e73226a306a32d5c89ba066d +MD5 (gnome2/gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263 diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 1888a2ba8fcd..39f05f6c3a84 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -1,10 +1,9 @@ lib/gtk-2.0/%%VERSION%%/engines/libmetal.so lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so -share/themes/Metal/ICON.png +libdata/pkgconfig/gtk-engines-2.pc share/themes/Metal/README.html share/themes/Metal/gtk-2.0/gtkrc -share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk-2.0/gtkrc @dirrm share/themes/Redmond95/gtk-2.0 diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile index 98d621350f0c..475f05818565 100644 --- a/x11-toolkits/at-spi/Makefile +++ b/x11-toolkits/at-spi/Makefile @@ -6,10 +6,10 @@ # PORTNAME= at-spi -PORTVERSION= 1.0.2 +PORTVERSION= 1.1.8 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/at-spi/distinfo b/x11-toolkits/at-spi/distinfo index f147d65aeeea..6440a59679ae 100644 --- a/x11-toolkits/at-spi/distinfo +++ b/x11-toolkits/at-spi/distinfo @@ -1 +1 @@ -MD5 (gnome2/at-spi-1.0.2.tar.bz2) = a242b806b58d924b7f58f769ff4e2298 +MD5 (gnome2/at-spi-1.1.8.tar.bz2) = 76e2df52a280a794bde0e6dd259c01f8 diff --git a/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c b/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c new file mode 100644 index 000000000000..161b17116292 --- /dev/null +++ b/x11-toolkits/at-spi/files/patch-registryd_deviceeventcontroller.c @@ -0,0 +1,10 @@ +--- registryd/deviceeventcontroller.c.orig Wed Nov 27 16:36:12 2002 ++++ registryd/deviceeventcontroller.c Wed Nov 27 16:38:21 2002 +@@ -32,6 +32,7 @@ + #include <string.h> + #include <ctype.h> + #include <stdio.h> ++#include <sys/time.h> + #include <bonobo/bonobo-exception.h> + + #include <X11/Xlib.h> diff --git a/x11-toolkits/at-spi/pkg-plist b/x11-toolkits/at-spi/pkg-plist index 4b89257f26e7..639018a75a67 100644 --- a/x11-toolkits/at-spi/pkg-plist +++ b/x11-toolkits/at-spi/pkg-plist @@ -9,6 +9,7 @@ include/at-spi-1.0/libspi/action.h include/at-spi-1.0/libspi/application.h include/at-spi-1.0/libspi/base.h include/at-spi-1.0/libspi/component.h +include/at-spi-1.0/libspi/devicelistener.h include/at-spi-1.0/libspi/editabletext.h include/at-spi-1.0/libspi/eventlistener.h include/at-spi-1.0/libspi/hyperlink.h @@ -27,10 +28,10 @@ include/at-spi-1.0/libspi/text.h include/at-spi-1.0/libspi/value.h lib/libcspi.a lib/libcspi.so -lib/libcspi.so.1 +lib/libcspi.so.8 lib/libspi.a lib/libspi.so -lib/libspi.so.1 +lib/libspi.so.8 lib/gtk-2.0/modules/libatk-bridge.so lib/orbit-2.0/Accessibility_module.so libdata/bonobo/servers/Accessibility_Registry.server @@ -55,8 +56,7 @@ share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html share/doc/at-spi-cspi/book1.html -share/doc/at-spi-cspi/c6121.html -share/doc/at-spi-cspi/c6124.html +share/doc/at-spi-cspi/c5968.html share/doc/at-spi-cspi/index.sgml share/doc/at-spi-cspi/spi-accessible.html share/doc/at-spi-cspi/spi-application.html diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile index 70fbae062f15..3de751a5de00 100644 --- a/x11-toolkits/eel2/Makefile +++ b/x11-toolkits/eel2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eel2 -PORTVERSION= 2.0.8 +PORTVERSION= 2.2.0.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 DIST_SUBDIR= gnome2 DISTNAME= eel-${PORTVERSION} @@ -18,7 +18,7 @@ MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \ gailutil.17:${PORTSDIR}/x11-toolkits/gail \ - gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui + gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11-toolkits/eel2/distinfo b/x11-toolkits/eel2/distinfo index c699a6c2a0c8..a2640b905243 100644 --- a/x11-toolkits/eel2/distinfo +++ b/x11-toolkits/eel2/distinfo @@ -1 +1 @@ -MD5 (gnome2/eel-2.0.8.tar.bz2) = fc2f7a38204e2b7640f5d6258fe11890 +MD5 (gnome2/eel-2.2.0.2.tar.bz2) = 5145fc6b81b55647d3dd056da77a46c0 diff --git a/x11-toolkits/eel2/pkg-plist b/x11-toolkits/eel2/pkg-plist index 5fee1d130ae9..f083fffaf02a 100644 --- a/x11-toolkits/eel2/pkg-plist +++ b/x11-toolkits/eel2/pkg-plist @@ -3,17 +3,19 @@ include/eel-2/eel/eel-art-extensions.h include/eel-2/eel/eel-art-gtk-extensions.h include/eel-2/eel/eel-background-box.h include/eel-2/eel/eel-background.h -include/eel-2/eel/eel-canvas-rect.h +include/eel-2/eel/eel-canvas-rect-ellipse.h +include/eel-2/eel/eel-canvas-util.h +include/eel-2/eel/eel-canvas.h include/eel-2/eel/eel-caption-table.h include/eel-2/eel/eel-caption.h include/eel-2/eel/eel-cell-renderer-pixbuf-list.h include/eel-2/eel/eel-dateedit-extensions.h include/eel-2/eel/eel-debug-drawing.h include/eel-2/eel/eel-debug.h +include/eel-2/eel/eel-editable-label.h include/eel-2/eel/eel-ellipsizing-label.h include/eel-2/eel/eel-enumeration.h include/eel-2/eel/eel-features.h -include/eel-2/eel/eel-font-picker.h include/eel-2/eel/eel-gconf-extensions.h include/eel-2/eel/eel-gdk-extensions.h include/eel-2/eel/eel-gdk-pixbuf-extensions.h @@ -31,10 +33,7 @@ include/eel-2/eel/eel-labeled-image.h include/eel-2/eel/eel-marshal.h include/eel-2/eel/eel-pango-extensions.h include/eel-2/eel/eel-password-dialog.h -include/eel-2/eel/eel-preferences-box.h -include/eel-2/eel/eel-preferences-group.h -include/eel-2/eel/eel-preferences-item.h -include/eel-2/eel/eel-preferences-pane.h +include/eel-2/eel/eel-preferences-glade.h include/eel-2/eel/eel-preferences.h include/eel-2/eel/eel-radio-button-group.h include/eel-2/eel/eel-self-checks.h @@ -42,7 +41,6 @@ include/eel-2/eel/eel-stock-dialogs.h include/eel-2/eel/eel-string-list.h include/eel-2/eel/eel-string-picker.h include/eel-2/eel/eel-string.h -include/eel-2/eel/eel-text-caption.h include/eel-2/eel/eel-type-builtins.h include/eel-2/eel/eel-types.h include/eel-2/eel/eel-vfs-extensions.h @@ -51,8 +49,9 @@ include/eel-2/eel/eel-xml-extensions.h include/eel-2/eel/eel.h lib/libeel-2.a lib/libeel-2.so -lib/libeel-2.so.2 +lib/libeel-2.so.4 libdata/pkgconfig/eel-2.0.pc +share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ar/LC_MESSAGES/eel-2.0.mo share/locale/az/LC_MESSAGES/eel-2.0.mo share/locale/be/LC_MESSAGES/eel-2.0.mo @@ -67,6 +66,7 @@ share/locale/en_GB/LC_MESSAGES/eel-2.0.mo share/locale/es/LC_MESSAGES/eel-2.0.mo share/locale/et/LC_MESSAGES/eel-2.0.mo share/locale/eu/LC_MESSAGES/eel-2.0.mo +share/locale/fa/LC_MESSAGES/eel-2.0.mo share/locale/fi/LC_MESSAGES/eel-2.0.mo share/locale/fr/LC_MESSAGES/eel-2.0.mo share/locale/ga/LC_MESSAGES/eel-2.0.mo @@ -80,6 +80,7 @@ share/locale/ko/LC_MESSAGES/eel-2.0.mo share/locale/lt/LC_MESSAGES/eel-2.0.mo share/locale/lv/LC_MESSAGES/eel-2.0.mo share/locale/mk/LC_MESSAGES/eel-2.0.mo +share/locale/mn/LC_MESSAGES/eel-2.0.mo share/locale/ms/LC_MESSAGES/eel-2.0.mo share/locale/nl/LC_MESSAGES/eel-2.0.mo share/locale/nn/LC_MESSAGES/eel-2.0.mo diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile index 48007940b9a7..c3515535376d 100644 --- a/x11-toolkits/gail/Makefile +++ b/x11-toolkits/gail/Makefile @@ -6,29 +6,27 @@ # PORTNAME= gail -PORTVERSION= 0.17 +PORTVERSION= 1.2.0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.17 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas +LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_REINPLACE= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --disable-gtk-doc +CONFIGURE_ARGS= --disable-gtk-doc \ + --with-html-dir=${PREFIX}/share/doc CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: - @find ${WRKSRC} -name Makefile.in | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' - .include <bsd.port.mk> diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo index 0f5e123e0b37..e0c656f9b85e 100644 --- a/x11-toolkits/gail/distinfo +++ b/x11-toolkits/gail/distinfo @@ -1 +1 @@ -MD5 (gnome2/gail-0.17.tar.bz2) = 23d73923bd0947d5c975afa13b2de3a3 +MD5 (gnome2/gail-1.2.0.tar.bz2) = 8b5b960eb4f71656ff798e63401d1bf0 diff --git a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in index a112ecbdca64..e69de29bb2d1 100644 --- a/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in +++ b/x11-toolkits/gail/files/patch-docs_reference_libgail-util_Makefile.in @@ -1,11 +0,0 @@ ---- docs/reference/libgail-util/Makefile.in.orig Tue Jul 23 12:42:03 2002 -+++ docs/reference/libgail-util/Makefile.in Tue Jul 23 12:42:30 2002 -@@ -103,7 +103,7 @@ - - INSTALLDIR = $(prefix)/share/gtk-doc - --HTML_DIR = ${datadir}/gtk-doc/html -+HTML_DIR = $(prefix)/share/doc - - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 167f83199d09..26f09c50d8b5 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,17 +6,17 @@ # PORTNAME= gal2 -PORTVERSION= 0.0.7 +PORTVERSION= 1.99.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gal2-0/0.0 -DISTNAME= ${PORTNAME}-0-${PORTVERSION} +MASTER_SITE_SUBDIR= sources/gal/1.99 +DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index cae9923cc410..95d431ce2f9e 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gal2-0-0.0.7.tar.bz2) = b6d7f0d41c0fcd07a943de3ddb92245e +MD5 (gnome2/gal-1.99.1.tar.bz2) = 7ce5122053c46a2b5c4445c30cc860b1 diff --git a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c index d12a6a930b83..69c179628356 100644 --- a/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c +++ b/x11-toolkits/gal2/files/patch-gal_e-table_e-table-group.c @@ -1,5 +1,5 @@ ---- gal/e-table/e-table-group.c.orig Thu Nov 28 13:51:22 2002 -+++ gal/e-table/e-table-group.c Thu Nov 28 22:23:01 2002 +--- gal/e-table/e-table-group.c.orig Wed Nov 20 10:02:06 2002 ++++ gal/e-table/e-table-group.c Thu Feb 6 22:35:27 2003 @@ -22,6 +22,7 @@ */ @@ -8,17 +8,17 @@ #include <gtk/gtksignal.h> #include <libgnomecanvas/gnome-canvas-rect-ellipse.h> #include "e-table-group.h" -@@ -129,13 +130,14 @@ +@@ -128,13 +129,14 @@ ETableHeader *header, ETableModel *model) { + va_list args; etg->full_header = full_header; - gtk_object_ref (GTK_OBJECT(etg->full_header)); + g_object_ref (etg->full_header); etg->header = header; - gtk_object_ref (GTK_OBJECT(etg->header)); + g_object_ref (etg->header); etg->model = model; - gtk_object_ref (GTK_OBJECT(etg->model)); + g_object_ref (etg->model); - gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, NULL); + gnome_canvas_item_construct (GNOME_CANVAS_ITEM (etg), parent, 0, args); } diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index 3309af5bd8ee..1c8cd9903601 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -1,142 +1,153 @@ -include/gal-2-0/gal/e-paned/e-hpaned.h -include/gal-2-0/gal/e-paned/e-paned.h -include/gal-2-0/gal/e-paned/e-vpaned.h -include/gal-2-0/gal/e-table/e-cell-checkbox.h -include/gal-2-0/gal/e-table/e-cell-combo.h -include/gal-2-0/gal/e-table/e-cell-date.h -include/gal-2-0/gal/e-table/e-cell-float.h -include/gal-2-0/gal/e-table/e-cell-number.h -include/gal-2-0/gal/e-table/e-cell-pixbuf.h -include/gal-2-0/gal/e-table/e-cell-popup.h -include/gal-2-0/gal/e-table/e-cell-progress.h -include/gal-2-0/gal/e-table/e-cell-size.h -include/gal-2-0/gal/e-table/e-cell-spin-button.h -include/gal-2-0/gal/e-table/e-cell-text.h -include/gal-2-0/gal/e-table/e-cell-toggle.h -include/gal-2-0/gal/e-table/e-cell-tree.h -include/gal-2-0/gal/e-table/e-cell-vbox.h -include/gal-2-0/gal/e-table/e-cell.h -include/gal-2-0/gal/e-table/e-table-click-to-add.h -include/gal-2-0/gal/e-table/e-table-col-dnd.h -include/gal-2-0/gal/e-table/e-table-col.h -include/gal-2-0/gal/e-table/e-table-column-specification.h -include/gal-2-0/gal/e-table/e-table-config.h -include/gal-2-0/gal/e-table/e-table-defines.h -include/gal-2-0/gal/e-table/e-table-extras.h -include/gal-2-0/gal/e-table/e-table-field-chooser-dialog.h -include/gal-2-0/gal/e-table/e-table-field-chooser-item.h -include/gal-2-0/gal/e-table/e-table-field-chooser.h -include/gal-2-0/gal/e-table/e-table-group-container.h -include/gal-2-0/gal/e-table/e-table-group-leaf.h -include/gal-2-0/gal/e-table/e-table-group.h -include/gal-2-0/gal/e-table/e-table-header-item.h -include/gal-2-0/gal/e-table/e-table-header-utils.h -include/gal-2-0/gal/e-table/e-table-header.h -include/gal-2-0/gal/e-table/e-table-item.h -include/gal-2-0/gal/e-table/e-table-memory-callbacks.h -include/gal-2-0/gal/e-table/e-table-memory-store.h -include/gal-2-0/gal/e-table/e-table-memory.h -include/gal-2-0/gal/e-table/e-table-model.h -include/gal-2-0/gal/e-table/e-table-one.h -include/gal-2-0/gal/e-table/e-table-scrolled.h -include/gal-2-0/gal/e-table/e-table-search.h -include/gal-2-0/gal/e-table/e-table-selection-model.h -include/gal-2-0/gal/e-table/e-table-simple.h -include/gal-2-0/gal/e-table/e-table-sort-info.h -include/gal-2-0/gal/e-table/e-table-sorted-variable.h -include/gal-2-0/gal/e-table/e-table-sorted.h -include/gal-2-0/gal/e-table/e-table-sorter.h -include/gal-2-0/gal/e-table/e-table-sorting-utils.h -include/gal-2-0/gal/e-table/e-table-specification.h -include/gal-2-0/gal/e-table/e-table-state.h -include/gal-2-0/gal/e-table/e-table-subset-variable.h -include/gal-2-0/gal/e-table/e-table-subset.h -include/gal-2-0/gal/e-table/e-table-tooltip.h -include/gal-2-0/gal/e-table/e-table-utils.h -include/gal-2-0/gal/e-table/e-table-without.h -include/gal-2-0/gal/e-table/e-table.h -include/gal-2-0/gal/e-table/e-tree-memory-callbacks.h -include/gal-2-0/gal/e-table/e-tree-memory.h -include/gal-2-0/gal/e-table/e-tree-model.h -include/gal-2-0/gal/e-table/e-tree-scrolled.h -include/gal-2-0/gal/e-table/e-tree-selection-model.h -include/gal-2-0/gal/e-table/e-tree-sorted.h -include/gal-2-0/gal/e-table/e-tree-table-adapter.h -include/gal-2-0/gal/e-table/e-tree.h -include/gal-2-0/gal/e-text/e-completion-match.h -include/gal-2-0/gal/e-text/e-completion-view.h -include/gal-2-0/gal/e-text/e-completion.h -include/gal-2-0/gal/e-text/e-entry.h -include/gal-2-0/gal/e-text/e-table-text-model.h -include/gal-2-0/gal/e-text/e-text-model-repos.h -include/gal-2-0/gal/e-text/e-text-model-uri.h -include/gal-2-0/gal/e-text/e-text-model.h -include/gal-2-0/gal/e-text/e-text.h -include/gal-2-0/gal/menus/gal-define-views-dialog.h -include/gal-2-0/gal/menus/gal-define-views-model.h -include/gal-2-0/gal/menus/gal-view-collection.h -include/gal-2-0/gal/menus/gal-view-etable.h -include/gal-2-0/gal/menus/gal-view-factory-etable.h -include/gal-2-0/gal/menus/gal-view-factory.h -include/gal-2-0/gal/menus/gal-view-instance-save-as-dialog.h -include/gal-2-0/gal/menus/gal-view-instance.h -include/gal-2-0/gal/menus/gal-view-new-dialog.h -include/gal-2-0/gal/menus/gal-view.h -include/gal-2-0/gal/shortcut-bar/e-group-bar.h -include/gal-2-0/gal/shortcut-bar/e-icon-bar-bg-item.h -include/gal-2-0/gal/shortcut-bar/e-icon-bar.h -include/gal-2-0/gal/shortcut-bar/e-shortcut-bar.h -include/gal-2-0/gal/shortcut-bar/e-shortcut-model.h -include/gal-2-0/gal/shortcut-bar/e-vscrolled-bar.h -include/gal-2-0/gal/util/e-bit-array.h -include/gal-2-0/gal/util/e-cache.h -include/gal-2-0/gal/util/e-marshal.h -include/gal-2-0/gal/util/e-sorter-array.h -include/gal-2-0/gal/util/e-sorter.h -include/gal-2-0/gal/util/e-text-event-processor-emacs-like.h -include/gal-2-0/gal/util/e-text-event-processor-types.h -include/gal-2-0/gal/util/e-text-event-processor.h -include/gal-2-0/gal/util/e-util.h -include/gal-2-0/gal/util/e-xml-utils.h -include/gal-2-0/gal/widgets/color-group.h -include/gal-2-0/gal/widgets/color-palette.h -include/gal-2-0/gal/widgets/e-canvas-background.h -include/gal-2-0/gal/widgets/e-canvas-utils.h -include/gal-2-0/gal/widgets/e-canvas-vbox.h -include/gal-2-0/gal/widgets/e-canvas.h -include/gal-2-0/gal/widgets/e-categories-master-list-array.h -include/gal-2-0/gal/widgets/e-categories-master-list-combo.h -include/gal-2-0/gal/widgets/e-categories-master-list-dialog-model.h -include/gal-2-0/gal/widgets/e-categories-master-list-dialog.h -include/gal-2-0/gal/widgets/e-categories-master-list-option-menu.h -include/gal-2-0/gal/widgets/e-categories-master-list.h -include/gal-2-0/gal/widgets/e-categories.h -include/gal-2-0/gal/widgets/e-colors.h -include/gal-2-0/gal/widgets/e-cursors.h -include/gal-2-0/gal/widgets/e-file-selection.h -include/gal-2-0/gal/widgets/e-font.h -include/gal-2-0/gal/widgets/e-gui-utils.h -include/gal-2-0/gal/widgets/e-hscrollbar.h -include/gal-2-0/gal/widgets/e-hsv-utils.h -include/gal-2-0/gal/widgets/e-option-menu.h -include/gal-2-0/gal/widgets/e-popup-menu.h -include/gal-2-0/gal/widgets/e-printable.h -include/gal-2-0/gal/widgets/e-reflow-model.h -include/gal-2-0/gal/widgets/e-reflow.h -include/gal-2-0/gal/widgets/e-scroll-frame.h -include/gal-2-0/gal/widgets/e-selection-model-array.h -include/gal-2-0/gal/widgets/e-selection-model-simple.h -include/gal-2-0/gal/widgets/e-selection-model.h -include/gal-2-0/gal/widgets/e-unicode.h -include/gal-2-0/gal/widgets/e-vscrollbar.h -include/gal-2-0/gal/widgets/gtk-combo-box.h -include/gal-2-0/gal/widgets/gtk-combo-stack.h -include/gal-2-0/gal/widgets/gtk-combo-text.h -include/gal-2-0/gal/widgets/widget-color-combo.h -include/gal-2-0/gal/widgets/widget-pixmap-combo.h -lib/libgal-2-0.a -lib/libgal-2-0.so -lib/libgal-2-0.so.2 +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-registry.h +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell-text.h +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-cell.h +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-factory.h +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table-item.h +include/gal-2.0/gal/a11y/e-table/gal-a11y-e-table.h +include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text-factory.h +include/gal-2.0/gal/a11y/e-text/gal-a11y-e-text.h +include/gal-2.0/gal/a11y/gal-a11y-util.h +include/gal-2.0/gal/e-paned/e-hpaned.h +include/gal-2.0/gal/e-paned/e-paned.h +include/gal-2.0/gal/e-paned/e-vpaned.h +include/gal-2.0/gal/e-table/e-cell-checkbox.h +include/gal-2.0/gal/e-table/e-cell-combo.h +include/gal-2.0/gal/e-table/e-cell-date.h +include/gal-2.0/gal/e-table/e-cell-float.h +include/gal-2.0/gal/e-table/e-cell-number.h +include/gal-2.0/gal/e-table/e-cell-pixbuf.h +include/gal-2.0/gal/e-table/e-cell-popup.h +include/gal-2.0/gal/e-table/e-cell-progress.h +include/gal-2.0/gal/e-table/e-cell-size.h +include/gal-2.0/gal/e-table/e-cell-spin-button.h +include/gal-2.0/gal/e-table/e-cell-text.h +include/gal-2.0/gal/e-table/e-cell-toggle.h +include/gal-2.0/gal/e-table/e-cell-tree.h +include/gal-2.0/gal/e-table/e-cell-vbox.h +include/gal-2.0/gal/e-table/e-cell.h +include/gal-2.0/gal/e-table/e-table-click-to-add.h +include/gal-2.0/gal/e-table/e-table-col-dnd.h +include/gal-2.0/gal/e-table/e-table-col.h +include/gal-2.0/gal/e-table/e-table-column-specification.h +include/gal-2.0/gal/e-table/e-table-config.h +include/gal-2.0/gal/e-table/e-table-defines.h +include/gal-2.0/gal/e-table/e-table-extras.h +include/gal-2.0/gal/e-table/e-table-field-chooser-dialog.h +include/gal-2.0/gal/e-table/e-table-field-chooser-item.h +include/gal-2.0/gal/e-table/e-table-field-chooser.h +include/gal-2.0/gal/e-table/e-table-group-container.h +include/gal-2.0/gal/e-table/e-table-group-leaf.h +include/gal-2.0/gal/e-table/e-table-group.h +include/gal-2.0/gal/e-table/e-table-header-item.h +include/gal-2.0/gal/e-table/e-table-header-utils.h +include/gal-2.0/gal/e-table/e-table-header.h +include/gal-2.0/gal/e-table/e-table-item.h +include/gal-2.0/gal/e-table/e-table-memory-callbacks.h +include/gal-2.0/gal/e-table/e-table-memory-store.h +include/gal-2.0/gal/e-table/e-table-memory.h +include/gal-2.0/gal/e-table/e-table-model.h +include/gal-2.0/gal/e-table/e-table-one.h +include/gal-2.0/gal/e-table/e-table-scrolled.h +include/gal-2.0/gal/e-table/e-table-search.h +include/gal-2.0/gal/e-table/e-table-selection-model.h +include/gal-2.0/gal/e-table/e-table-simple.h +include/gal-2.0/gal/e-table/e-table-sort-info.h +include/gal-2.0/gal/e-table/e-table-sorted-variable.h +include/gal-2.0/gal/e-table/e-table-sorted.h +include/gal-2.0/gal/e-table/e-table-sorter.h +include/gal-2.0/gal/e-table/e-table-sorting-utils.h +include/gal-2.0/gal/e-table/e-table-specification.h +include/gal-2.0/gal/e-table/e-table-state.h +include/gal-2.0/gal/e-table/e-table-subset-variable.h +include/gal-2.0/gal/e-table/e-table-subset.h +include/gal-2.0/gal/e-table/e-table-tooltip.h +include/gal-2.0/gal/e-table/e-table-utils.h +include/gal-2.0/gal/e-table/e-table-without.h +include/gal-2.0/gal/e-table/e-table.h +include/gal-2.0/gal/e-table/e-tree-memory-callbacks.h +include/gal-2.0/gal/e-table/e-tree-memory.h +include/gal-2.0/gal/e-table/e-tree-model.h +include/gal-2.0/gal/e-table/e-tree-scrolled.h +include/gal-2.0/gal/e-table/e-tree-selection-model.h +include/gal-2.0/gal/e-table/e-tree-sorted.h +include/gal-2.0/gal/e-table/e-tree-table-adapter.h +include/gal-2.0/gal/e-table/e-tree.h +include/gal-2.0/gal/e-text/e-completion-match.h +include/gal-2.0/gal/e-text/e-completion-view.h +include/gal-2.0/gal/e-text/e-completion.h +include/gal-2.0/gal/e-text/e-entry.h +include/gal-2.0/gal/e-text/e-table-text-model.h +include/gal-2.0/gal/e-text/e-text-model-repos.h +include/gal-2.0/gal/e-text/e-text-model-uri.h +include/gal-2.0/gal/e-text/e-text-model.h +include/gal-2.0/gal/e-text/e-text.h +include/gal-2.0/gal/menus/gal-define-views-dialog.h +include/gal-2.0/gal/menus/gal-define-views-model.h +include/gal-2.0/gal/menus/gal-view-collection.h +include/gal-2.0/gal/menus/gal-view-etable.h +include/gal-2.0/gal/menus/gal-view-factory-etable.h +include/gal-2.0/gal/menus/gal-view-factory.h +include/gal-2.0/gal/menus/gal-view-instance-save-as-dialog.h +include/gal-2.0/gal/menus/gal-view-instance.h +include/gal-2.0/gal/menus/gal-view-new-dialog.h +include/gal-2.0/gal/menus/gal-view.h +include/gal-2.0/gal/shortcut-bar/e-group-bar.h +include/gal-2.0/gal/shortcut-bar/e-icon-bar-bg-item.h +include/gal-2.0/gal/shortcut-bar/e-icon-bar.h +include/gal-2.0/gal/shortcut-bar/e-shortcut-bar.h +include/gal-2.0/gal/shortcut-bar/e-shortcut-model.h +include/gal-2.0/gal/shortcut-bar/e-vscrolled-bar.h +include/gal-2.0/gal/util/e-bit-array.h +include/gal-2.0/gal/util/e-cache.h +include/gal-2.0/gal/util/e-iconv.h +include/gal-2.0/gal/util/e-marshal.h +include/gal-2.0/gal/util/e-sorter-array.h +include/gal-2.0/gal/util/e-sorter.h +include/gal-2.0/gal/util/e-text-event-processor-emacs-like.h +include/gal-2.0/gal/util/e-text-event-processor-types.h +include/gal-2.0/gal/util/e-text-event-processor.h +include/gal-2.0/gal/util/e-util.h +include/gal-2.0/gal/util/e-xml-utils.h +include/gal-2.0/gal/widgets/color-group.h +include/gal-2.0/gal/widgets/color-palette.h +include/gal-2.0/gal/widgets/e-canvas-background.h +include/gal-2.0/gal/widgets/e-canvas-utils.h +include/gal-2.0/gal/widgets/e-canvas-vbox.h +include/gal-2.0/gal/widgets/e-canvas.h +include/gal-2.0/gal/widgets/e-categories-master-list-array.h +include/gal-2.0/gal/widgets/e-categories-master-list-combo.h +include/gal-2.0/gal/widgets/e-categories-master-list-dialog-model.h +include/gal-2.0/gal/widgets/e-categories-master-list-dialog.h +include/gal-2.0/gal/widgets/e-categories-master-list-option-menu.h +include/gal-2.0/gal/widgets/e-categories-master-list.h +include/gal-2.0/gal/widgets/e-categories.h +include/gal-2.0/gal/widgets/e-colors.h +include/gal-2.0/gal/widgets/e-cursors.h +include/gal-2.0/gal/widgets/e-file-selection.h +include/gal-2.0/gal/widgets/e-font.h +include/gal-2.0/gal/widgets/e-gui-utils.h +include/gal-2.0/gal/widgets/e-hscrollbar.h +include/gal-2.0/gal/widgets/e-hsv-utils.h +include/gal-2.0/gal/widgets/e-option-menu.h +include/gal-2.0/gal/widgets/e-popup-menu.h +include/gal-2.0/gal/widgets/e-printable.h +include/gal-2.0/gal/widgets/e-reflow-model.h +include/gal-2.0/gal/widgets/e-reflow.h +include/gal-2.0/gal/widgets/e-scroll-frame.h +include/gal-2.0/gal/widgets/e-selection-model-array.h +include/gal-2.0/gal/widgets/e-selection-model-simple.h +include/gal-2.0/gal/widgets/e-selection-model.h +include/gal-2.0/gal/widgets/e-unicode.h +include/gal-2.0/gal/widgets/e-vscrollbar.h +include/gal-2.0/gal/widgets/gtk-combo-box.h +include/gal-2.0/gal/widgets/gtk-combo-stack.h +include/gal-2.0/gal/widgets/gtk-combo-text.h +include/gal-2.0/gal/widgets/widget-color-combo.h +include/gal-2.0/gal/widgets/widget-pixmap-combo.h +lib/gtk-2.0/modules/libgal-a11y-2.0.so +lib/libgal-2.0.a +lib/libgal-2.0.so +lib/libgal-2.0.so.0 libdata/pkgconfig/gal-2.0.pc share/doc/gal2/gal-api.sgml share/doc/gal2/gal-decl.txt @@ -144,46 +155,48 @@ share/doc/gal2/gal-sections.txt share/doc/gal2/gal.hierarchy share/doc/gal2/gal.signals share/doc/gal2/gal.types -share/gnome/gal-2-0/%%VERSION%%/glade/e-categories-master-list-dialog.glade -share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config-no-group.glade -share/gnome/gal-2-0/%%VERSION%%/glade/e-table-config.glade -share/gnome/gal-2-0/%%VERSION%%/glade/e-table-field-chooser.glade -share/gnome/gal-2-0/%%VERSION%%/glade/e-table-group.glade -share/gnome/gal-2-0/%%VERSION%%/glade/gal-categories.glade -share/gnome/gal-2-0/%%VERSION%%/glade/gal-define-views.glade -share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade -share/gnome/gal-2-0/%%VERSION%%/glade/gal-view-new-dialog.glade -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_birthday_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_business_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_favorites_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_gifts_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_goals_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_holiday_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_ideas_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_international_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_personal_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_status_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_strategies_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png -share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png -@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps/categories -@dirrm share/gnome/gal-2-0/%%VERSION%%/pixmaps -@dirrm share/gnome/gal-2-0/%%VERSION%%/glade -@dirrm share/gnome/gal-2-0/%%VERSION%% -@dirrm share/gnome/gal-2-0 +share/gnome/gal-2.0/%%VERSION%%/glade/e-categories-master-list-dialog.glade +share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config-no-group.glade +share/gnome/gal-2.0/%%VERSION%%/glade/e-table-config.glade +share/gnome/gal-2.0/%%VERSION%%/glade/e-table-field-chooser.glade +share/gnome/gal-2.0/%%VERSION%%/glade/gal-categories.glade +share/gnome/gal-2.0/%%VERSION%%/glade/gal-define-views.glade +share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-instance-save-as-dialog.glade +share/gnome/gal-2.0/%%VERSION%%/glade/gal-view-new-dialog.glade +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_birthday_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_business_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_favorites_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_gifts_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_goals_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday-cards_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_holiday_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_hot-contacts_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_ideas_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_international_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_key-customer_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_miscellaneous_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_personal_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_phonecalls_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_status_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_strategies_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_suppliers_16.png +share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories/category_time-and-expenses_16.png +@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps/categories +@dirrm share/gnome/gal-2.0/%%VERSION%%/pixmaps +@dirrm share/gnome/gal-2.0/%%VERSION%%/glade +@dirrm share/gnome/gal-2.0/%%VERSION%% +@dirrm share/gnome/gal-2.0 @dirrm share/doc/gal2/gal @dirrm share/doc/gal2 -@dirrm include/gal-2-0/gal/widgets -@dirrm include/gal-2-0/gal/util -@dirrm include/gal-2-0/gal/shortcut-bar -@dirrm include/gal-2-0/gal/menus -@dirrm include/gal-2-0/gal/e-text -@dirrm include/gal-2-0/gal/e-table -@dirrm include/gal-2-0/gal/e-paned -@dirrm include/gal-2-0/gal -@dirrm include/gal-2-0 +@dirrm include/gal-2.0/gal/widgets +@dirrm include/gal-2.0/gal/util +@dirrm include/gal-2.0/gal/shortcut-bar +@dirrm include/gal-2.0/gal/menus +@dirrm include/gal-2.0/gal/e-text +@dirrm include/gal-2.0/gal/e-table +@dirrm include/gal-2.0/gal/e-paned +@dirrm include/gal-2.0/gal/a11y/e-text +@dirrm include/gal-2.0/gal/a11y/e-table +@dirrm include/gal-2.0/gal/a11y +@dirrm include/gal-2.0/gal +@dirrm include/gal-2.0 diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile index d08a560c30f3..2c0841063dab 100644 --- a/x11-toolkits/gnome-themes/Makefile +++ b/x11-toolkits/gnome-themes/Makefile @@ -6,15 +6,17 @@ # PORTNAME= gnome-themes -PORTVERSION= 1.0 +PORTVERSION= 2.2 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine +LIB_DEPENDS= metacity-private.0:${PORTSDIR}/x11-wm/metacity +RUN_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-toolkits/gnome-themes/distinfo b/x11-toolkits/gnome-themes/distinfo index 682cebb1ffc4..a0b32f0fe100 100644 --- a/x11-toolkits/gnome-themes/distinfo +++ b/x11-toolkits/gnome-themes/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-themes-1.0.tar.bz2) = fd9f0cc87edfa7c8d9e04293f72f131d +MD5 (gnome2/gnome-themes-2.2.tar.bz2) = 18f9b8cea0469bf2ae934024c6f4fa9d diff --git a/x11-toolkits/gnome-themes/files/patch-configure b/x11-toolkits/gnome-themes/files/patch-configure new file mode 100644 index 000000000000..8afd3d20e32f --- /dev/null +++ b/x11-toolkits/gnome-themes/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Mon Feb 3 20:16:09 2003 ++++ configure Mon Feb 3 20:16:31 2003 +@@ -7640,6 +7640,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in new file mode 100644 index 000000000000..02365472fd62 --- /dev/null +++ b/x11-toolkits/gnome-themes/files/patch-metacity-themes_Makefile.in @@ -0,0 +1,11 @@ +--- metacity-themes/Makefile.in.orig Mon Feb 3 20:16:59 2003 ++++ metacity-themes/Makefile.in Mon Feb 3 20:17:33 2003 +@@ -120,7 +120,7 @@ + THEMES = Mist Sandwish Smokey + + +-THEME_DIR = $(datadir)/themes ++THEME_DIR = $(datadir)/gnome/themes + THEME_SUBDIR = metacity-1 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h diff --git a/x11-toolkits/gnome-themes/pkg-plist b/x11-toolkits/gnome-themes/pkg-plist index 6a2667b67616..f69543fe3d6f 100644 --- a/x11-toolkits/gnome-themes/pkg-plist +++ b/x11-toolkits/gnome-themes/pkg-plist @@ -1,3 +1,241 @@ +lib/gtk-2.0/2.2.0/engines/libcrux-engine.so +lib/gtk-2.0/2.2.0/engines/liblighthouseblue.so +lib/gtk-2.0/2.2.0/engines/libmist.so +share/eazel-engine/arrow_down-spinner.png +share/eazel-engine/arrow_down.png +share/eazel-engine/arrow_left.png +share/eazel-engine/arrow_right.png +share/eazel-engine/arrow_up-spinner.png +share/eazel-engine/arrow_up.png +share/eazel-engine/check-active-default-focus.png +share/eazel-engine/check-active-default.png +share/eazel-engine/check-active-hilight-focus.png +share/eazel-engine/check-active-hilight.png +share/eazel-engine/check-active-insensitive.png +share/eazel-engine/check-active-pressed-focus.png +share/eazel-engine/check-active-pressed.png +share/eazel-engine/check-default-focus.png +share/eazel-engine/check-default.png +share/eazel-engine/check-hilight-focus.png +share/eazel-engine/check-hilight.png +share/eazel-engine/check-insensitive.png +share/eazel-engine/check-pressed-focus.png +share/eazel-engine/check-pressed.png +share/eazel-engine/progressbar-left.png +share/eazel-engine/progressbar-right.png +share/eazel-engine/progressbar.png +share/eazel-engine/progressbar_trough.png +share/eazel-engine/radio-active-default-focus.png +share/eazel-engine/radio-active-default.png +share/eazel-engine/radio-active-hilight-focus.png +share/eazel-engine/radio-active-hilight.png +share/eazel-engine/radio-active-insensitive.png +share/eazel-engine/radio-active-pressed-focus.png +share/eazel-engine/radio-active-pressed.png +share/eazel-engine/radio-default-focus.png +share/eazel-engine/radio-default.png +share/eazel-engine/radio-hilight-focus.png +share/eazel-engine/radio-hilight.png +share/eazel-engine/radio-insensitive.png +share/eazel-engine/radio-pressed-focus.png +share/eazel-engine/radio-pressed.png +share/eazel-engine/scroller-arrow-down-hilight.png +share/eazel-engine/scroller-arrow-down-pressed.png +share/eazel-engine/scroller-arrow-down.png +share/eazel-engine/scroller-arrow-left-hilight.png +share/eazel-engine/scroller-arrow-left-pressed.png +share/eazel-engine/scroller-arrow-left.png +share/eazel-engine/scroller-arrow-right-hilight.png +share/eazel-engine/scroller-arrow-right-pressed.png +share/eazel-engine/scroller-arrow-right.png +share/eazel-engine/scroller-arrow-up-hilight.png +share/eazel-engine/scroller-arrow-up-pressed.png +share/eazel-engine/scroller-arrow-up.png +share/eazel-engine/scroller-h-hilight.png +share/eazel-engine/scroller-h-thumb-hilight.png +share/eazel-engine/scroller-h-thumb.png +share/eazel-engine/scroller-h-trough.png +share/eazel-engine/scroller-h.png +share/eazel-engine/scroller-v-hilight.png +share/eazel-engine/scroller-v-thumb-hilight.png +share/eazel-engine/scroller-v-thumb.png +share/eazel-engine/scroller-v-trough.png +share/eazel-engine/scroller-v.png +share/eazel-engine/slider_h_thumb.png +share/eazel-engine/slider_h_trough.png +share/eazel-engine/slider_h_trough_focus.png +share/eazel-engine/slider_v_thumb.png +share/eazel-engine/slider_v_trough.png +share/eazel-engine/slider_v_trough_focus.png +share/eazel-engine/tab_left-unsel.png +share/eazel-engine/tab_left.png +share/eazel-engine/tab_right.png +share/eazel-engine/tab_sel-bottom.png +share/eazel-engine/tab_sel.png +share/eazel-engine/tab_usel-bottom-left.png +share/eazel-engine/tab_usel-bottom.png +share/eazel-engine/tab_usel-left.png +share/eazel-engine/tab_usel.png +share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml +share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-border-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-left-corner.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-mid-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-bottom-right-corner.png +share/gnome/themes/Sandwish/metacity-1/active-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/active-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/active-button.png +share/gnome/themes/Sandwish/metacity-1/active-close-button.png +share/gnome/themes/Sandwish/metacity-1/active-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-left-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/active-left-top-border.png +share/gnome/themes/Sandwish/metacity-1/active-maximize-button.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/active-menu-button.png +share/gnome/themes/Sandwish/metacity-1/active-minimize-button.png +share/gnome/themes/Sandwish/metacity-1/active-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-right-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/active-right-top-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-left.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-left.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-mid-right.png +share/gnome/themes/Sandwish/metacity-1/active-top-center-right.png +share/gnome/themes/Sandwish/metacity-1/active-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-left-corner.png +share/gnome/themes/Sandwish/metacity-1/active-top-mid-left-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-mid-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/active-top-right-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-border-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-border-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-left-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-mid-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-bottom-right-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/inactive-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/inactive-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-close-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/inactive-left-top-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-maximize-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-prelight.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button-pressed.png +share/gnome/themes/Sandwish/metacity-1/inactive-menu-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-minimize-button.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border-shaded.png +share/gnome/themes/Sandwish/metacity-1/inactive-right-top-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-left.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-mid.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-center-right.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-left-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-left-corner.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-mid-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-right-border.png +share/gnome/themes/Sandwish/metacity-1/inactive-top-right-corner.png +share/gnome/themes/Sandwish/metacity-1/metacity-theme-1.xml +share/gnome/themes/Smokey/metacity-1/button-base.png +share/gnome/themes/Smokey/metacity-1/button-pressed-shine.png +share/gnome/themes/Smokey/metacity-1/button-pressed.png +share/gnome/themes/Smokey/metacity-1/button-shine.png +share/gnome/themes/Smokey/metacity-1/close.png +share/gnome/themes/Smokey/metacity-1/maximize.png +share/gnome/themes/Smokey/metacity-1/metacity-theme-1.xml +share/gnome/themes/Smokey/metacity-1/minimize.png +share/gnome/themes/Smokey/metacity-1/stripes.png +share/icons/Crux/12x12/filesystems/gnome-fs-directory.png +share/icons/Crux/12x12/filesystems/gnome-fs-regular.png +share/icons/Crux/192x192/filesystems/gnome-fs-directory.png +share/icons/Crux/192x192/filesystems/gnome-fs-regular.png +share/icons/Crux/20x20/filesystems/gnome-fs-directory.png +share/icons/Crux/20x20/filesystems/gnome-fs-regular.png +share/icons/Crux/24x24/filesystems/gnome-fs-directory.png +share/icons/Crux/24x24/filesystems/gnome-fs-regular.png +share/icons/Crux/36x36/filesystems/gnome-fs-directory.png +share/icons/Crux/36x36/filesystems/gnome-fs-regular.png +share/icons/Crux/48x48/emblems/emblem-nowrite.png +share/icons/Crux/48x48/filesystems/gnome-fs-directory.png +share/icons/Crux/48x48/filesystems/gnome-fs-regular.png +share/icons/Crux/72x72/emblems/emblem-nowrite.png +share/icons/Crux/72x72/filesystems/gnome-fs-directory.png +share/icons/Crux/72x72/filesystems/gnome-fs-regular.png +share/icons/Crux/96x96/emblems/emblem-nowrite.png +share/icons/Crux/96x96/filesystems/gnome-fs-directory.png +share/icons/Crux/96x96/filesystems/gnome-fs-regular.png +share/icons/Crux/index.theme +share/icons/Flat-Blue/12x12/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/12x12/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-empty.png +share/icons/Flat-Blue/192x192/filesystems/gnome-fs-trash-full.png +share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark-missing.png +share/icons/Flat-Blue/20x20/filesystems/gnome-fs-bookmark.png +share/icons/Flat-Blue/24x24/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/24x24/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/36x36/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/36x36/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-broken-image.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-spreadsheet.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-stalled.png +share/icons/Flat-Blue/48x48/devices/gnome-dev-symlink.png +share/icons/Flat-Blue/48x48/emblems/emblem-art.png +share/icons/Flat-Blue/48x48/emblems/emblem-broken-link.png +share/icons/Flat-Blue/48x48/emblems/emblem-camera.png +share/icons/Flat-Blue/48x48/emblems/emblem-documents.png +share/icons/Flat-Blue/48x48/emblems/emblem-generic.png +share/icons/Flat-Blue/48x48/emblems/emblem-mail.png +share/icons/Flat-Blue/48x48/emblems/emblem-multimedia.png +share/icons/Flat-Blue/48x48/emblems/emblem-package.png +share/icons/Flat-Blue/48x48/emblems/emblem-pictures.png +share/icons/Flat-Blue/48x48/emblems/emblem-sound.png +share/icons/Flat-Blue/48x48/emblems/emblem-symbolic-link.png +share/icons/Flat-Blue/48x48/emblems/emblem-trash.png +share/icons/Flat-Blue/48x48/emblems/emblem-web.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark-missing.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-bookmark.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-home.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-loading.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Flat-Blue/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Flat-Blue/72x72/devices/gnome-dev-search.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/72x72/filesystems/gnome-fs-web.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory-accept.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-directory.png +share/icons/Flat-Blue/96x96/filesystems/gnome-fs-regular.png +share/icons/Flat-Blue/index.theme +share/icons/Flat-Blue/scalable/emblems/emblem-OK.svg +share/icons/Flat-Blue/scalable/emblems/emblem-certified.svg +share/icons/Flat-Blue/scalable/emblems/emblem-cool.svg +share/icons/Flat-Blue/scalable/emblems/emblem-danger.svg +share/icons/Flat-Blue/scalable/emblems/emblem-distinguished.svg +share/icons/Flat-Blue/scalable/emblems/emblem-draft.svg +share/icons/Flat-Blue/scalable/emblems/emblem-favorite.svg +share/icons/Flat-Blue/scalable/emblems/emblem-important.svg +share/icons/Flat-Blue/scalable/emblems/emblem-new.svg +share/icons/Flat-Blue/scalable/emblems/emblem-noread.svg +share/icons/Flat-Blue/scalable/emblems/emblem-nowrite.svg +share/icons/Flat-Blue/scalable/emblems/emblem-ohno.svg +share/icons/Flat-Blue/scalable/emblems/emblem-personal.svg +share/icons/Flat-Blue/scalable/emblems/emblem-special.svg +share/icons/Flat-Blue/scalable/emblems/emblem-urgent.svg share/icons/HighContrast/index.theme share/icons/HighContrastInverse/index.theme share/icons/HighContrastLargePrint/48x48/apps/accessibility-directory.png @@ -652,12 +890,84 @@ share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-video-x-msvideo.png share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/LowContrastLargePrint/48x48/mimetypes/gnome-package.png share/icons/LowContrastLargePrint/index.theme +share/icons/Sandy/12x12/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/12x12/filesystems/gnome-fs-directory.png +share/icons/Sandy/24x24/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/24x24/filesystems/gnome-fs-directory.png +share/icons/Sandy/36x36/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/36x36/filesystems/gnome-fs-directory.png +share/icons/Sandy/48x48/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/48x48/filesystems/gnome-fs-directory.png +share/icons/Sandy/72x72/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/72x72/filesystems/gnome-fs-directory.png +share/icons/Sandy/96x96/filesystems/gnome-fs-directory-accept.png +share/icons/Sandy/96x96/filesystems/gnome-fs-directory.png +share/icons/Sandy/index.theme +share/icons/Smokey-Blue/48x48/emblems/emblem-nowrite.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-72.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory-96.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-directory.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty-accept.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full-accept.png +share/icons/Smokey-Blue/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Smokey-Blue/index.theme +share/icons/Smokey-Red/48x48/emblems/emblem-nowrite.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-72.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory-96.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-directory.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty-accept.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-empty.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full-accept.png +share/icons/Smokey-Red/48x48/filesystems/gnome-fs-trash-full.png +share/icons/Smokey-Red/index.theme +share/themes/Crux/gtk-2.0/gtkrc +share/themes/Crux/index.theme +share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_all_prelight.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_bottom_prelight.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_flat.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_normal.png +share/themes/Grand-Canyon/gtk-2.0/3d_top_prelight.png +share/themes/Grand-Canyon/gtk-2.0/arrow_down.png +share/themes/Grand-Canyon/gtk-2.0/arrow_left.png +share/themes/Grand-Canyon/gtk-2.0/arrow_null.png +share/themes/Grand-Canyon/gtk-2.0/arrow_right.png +share/themes/Grand-Canyon/gtk-2.0/arrow_sub.png +share/themes/Grand-Canyon/gtk-2.0/arrow_up.png +share/themes/Grand-Canyon/gtk-2.0/blank.png +share/themes/Grand-Canyon/gtk-2.0/button_default.png +share/themes/Grand-Canyon/gtk-2.0/check2.png +share/themes/Grand-Canyon/gtk-2.0/entry1.png +share/themes/Grand-Canyon/gtk-2.0/gtkrc +share/themes/Grand-Canyon/gtk-2.0/gtkrc.pants +share/themes/Grand-Canyon/gtk-2.0/hline.png +share/themes/Grand-Canyon/gtk-2.0/htrough.png +share/themes/Grand-Canyon/gtk-2.0/in.png +share/themes/Grand-Canyon/gtk-2.0/menu_shadow.png +share/themes/Grand-Canyon/gtk-2.0/minus.png +share/themes/Grand-Canyon/gtk-2.0/mradio1.png +share/themes/Grand-Canyon/gtk-2.0/mradio2.png +share/themes/Grand-Canyon/gtk-2.0/notebook_bottom_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_left_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_right_flat.png +share/themes/Grand-Canyon/gtk-2.0/notebook_top_flat.png +share/themes/Grand-Canyon/gtk-2.0/option_menu.png +share/themes/Grand-Canyon/gtk-2.0/plus.png +share/themes/Grand-Canyon/gtk-2.0/radio2.png +share/themes/Grand-Canyon/gtk-2.0/vtrough.png +share/themes/Grand-Canyon/index.theme share/themes/HighContrast/gtk-2.0/gtkrc share/themes/HighContrast/index.theme share/themes/HighContrastInverse/gtk-2.0/gtkrc share/themes/HighContrastInverse/index.theme share/themes/HighContrastLargePrint/gtk-2.0/gtkrc -share/themes/HighContrastLargePrint/index.theme +share/themes/HighContrastLargePrint/index.theme~ share/themes/HighContrastLargePrint/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrint/pixmaps/double-click-off.png share/themes/HighContrastLargePrint/pixmaps/double-click-on.png @@ -790,7 +1100,7 @@ share/themes/HighContrastLargePrint/pixmaps/volume-min.png share/themes/HighContrastLargePrint/pixmaps/volume-mute.png share/themes/HighContrastLargePrint/pixmaps/volume-zero.png share/themes/HighContrastLargePrintInverse/gtk-2.0/gtkrc -share/themes/HighContrastLargePrintInverse/index.theme +share/themes/HighContrastLargePrintInverse/index.theme~ share/themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png share/themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png @@ -1055,10 +1365,11 @@ share/themes/LargePrint/pixmaps/volume-medium.png share/themes/LargePrint/pixmaps/volume-min.png share/themes/LargePrint/pixmaps/volume-mute.png share/themes/LargePrint/pixmaps/volume-zero.png +share/themes/LighthouseBlue/gtk-2.0/gtkrc share/themes/LowContrast/gtk-2.0/gtkrc -share/themes/LowContrast/index.theme +share/themes/LowContrast/index.theme~ share/themes/LowContrastLargePrint/gtk-2.0/gtkrc -share/themes/LowContrastLargePrint/index.theme +share/themes/LowContrastLargePrint/index.theme~ share/themes/LowContrastLargePrint/pixmaps/double-click-maybe.png share/themes/LowContrastLargePrint/pixmaps/double-click-off.png share/themes/LowContrastLargePrint/pixmaps/double-click-on.png @@ -1190,11 +1501,50 @@ share/themes/LowContrastLargePrint/pixmaps/volume-medium.png share/themes/LowContrastLargePrint/pixmaps/volume-min.png share/themes/LowContrastLargePrint/pixmaps/volume-mute.png share/themes/LowContrastLargePrint/pixmaps/volume-zero.png +share/themes/Mist/gtk-2.0/gtkrc +share/themes/Mist/index.theme +share/themes/Ocean-Dream/index.theme +share/themes/Simple/gtk-2.0/gtkrc +share/themes/Simple/index.theme +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-prelight.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-pressed.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue-sb.png +share/themes/Smokey-Blue/gtk-2.0/bubble-blue.png +share/themes/Smokey-Blue/gtk-2.0/bubble-grey.png +share/themes/Smokey-Blue/gtk-2.0/check1.png +share/themes/Smokey-Blue/gtk-2.0/check2.png +share/themes/Smokey-Blue/gtk-2.0/gtkrc +share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-bottom-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-left-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-right-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-blue1.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey.png +share/themes/Smokey-Blue/gtk-2.0/halfbubble-top-grey1.png +share/themes/Smokey-Blue/gtk-2.0/lines_background.png +share/themes/Smokey-Blue/gtk-2.0/lines_background_blue.png +share/themes/Smokey-Blue/gtk-2.0/option1.png +share/themes/Smokey-Blue/gtk-2.0/option2.png +share/themes/Smokey-Blue/index.theme +share/themes/Traditional/index.theme +@dirrm share/themes/Traditional +@dirrm share/themes/Smokey-Blue/gtk-2.0 +@dirrm share/themes/Smokey-Blue +@dirrm share/themes/Simple/gtk-2.0 +@dirrm share/themes/Simple +@dirrm share/themes/Ocean-Dream +@dirrm share/themes/Mist/gtk-2.0 +@dirrm share/themes/Mist @dirrm share/themes/LowContrastLargePrint/pixmaps @dirrm share/themes/LowContrastLargePrint/gtk-2.0 @dirrm share/themes/LowContrastLargePrint @dirrm share/themes/LowContrast/gtk-2.0 @dirrm share/themes/LowContrast +@dirrm share/themes/LighthouseBlue/gtk-2.0 +@dirrm share/themes/LighthouseBlue @dirrm share/themes/LargePrint/pixmaps @dirrm share/themes/LargePrint/gtk-2.0 @dirrm share/themes/LargePrint @@ -1208,6 +1558,31 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png @dirrm share/themes/HighContrastInverse @dirrm share/themes/HighContrast/gtk-2.0 @dirrm share/themes/HighContrast +@dirrm share/themes/Grand-Canyon/gtk-2.0 +@dirrm share/themes/Grand-Canyon +@dirrm share/themes/Crux/gtk-2.0 +@dirrm share/themes/Crux +@dirrm share/icons/Smokey-Red/48x48/filesystems +@dirrm share/icons/Smokey-Red/48x48/emblems +@dirrm share/icons/Smokey-Red/48x48 +@dirrm share/icons/Smokey-Red +@dirrm share/icons/Smokey-Blue/48x48/filesystems +@dirrm share/icons/Smokey-Blue/48x48/emblems +@dirrm share/icons/Smokey-Blue/48x48 +@dirrm share/icons/Smokey-Blue +@dirrm share/icons/Sandy/96x96/filesystems +@dirrm share/icons/Sandy/96x96 +@dirrm share/icons/Sandy/72x72/filesystems +@dirrm share/icons/Sandy/72x72 +@dirrm share/icons/Sandy/48x48/filesystems +@dirrm share/icons/Sandy/48x48 +@dirrm share/icons/Sandy/36x36/filesystems +@dirrm share/icons/Sandy/36x36 +@dirrm share/icons/Sandy/24x24/filesystems +@dirrm share/icons/Sandy/24x24 +@dirrm share/icons/Sandy/12x12/filesystems +@dirrm share/icons/Sandy/12x12 +@dirrm share/icons/Sandy @dirrm share/icons/LowContrastLargePrint/48x48/mimetypes @dirrm share/icons/LowContrastLargePrint/48x48/filesystems @dirrm share/icons/LowContrastLargePrint/48x48/emblems @@ -1233,4 +1608,56 @@ share/themes/LowContrastLargePrint/pixmaps/volume-zero.png @dirrm share/icons/HighContrastLargePrint @dirrm share/icons/HighContrastInverse @dirrm share/icons/HighContrast +@dirrm share/icons/Flat-Blue/scalable/emblems +@dirrm share/icons/Flat-Blue/scalable +@dirrm share/icons/Flat-Blue/96x96/filesystems +@dirrm share/icons/Flat-Blue/96x96 +@dirrm share/icons/Flat-Blue/72x72/filesystems +@dirrm share/icons/Flat-Blue/72x72/devices +@dirrm share/icons/Flat-Blue/72x72 +@dirrm share/icons/Flat-Blue/48x48/filesystems +@dirrm share/icons/Flat-Blue/48x48/emblems +@dirrm share/icons/Flat-Blue/48x48/devices +@dirrm share/icons/Flat-Blue/48x48 +@dirrm share/icons/Flat-Blue/36x36/filesystems +@dirrm share/icons/Flat-Blue/36x36/emblems +@dirrm share/icons/Flat-Blue/36x36 +@dirrm share/icons/Flat-Blue/24x24/filesystems +@dirrm share/icons/Flat-Blue/24x24/emblems +@dirrm share/icons/Flat-Blue/24x24 +@dirrm share/icons/Flat-Blue/20x20/filesystems +@dirrm share/icons/Flat-Blue/20x20 +@dirrm share/icons/Flat-Blue/192x192/filesystems +@dirrm share/icons/Flat-Blue/192x192 +@dirrm share/icons/Flat-Blue/12x12/filesystems +@dirrm share/icons/Flat-Blue/12x12/emblems +@dirrm share/icons/Flat-Blue/12x12 +@dirrm share/icons/Flat-Blue +@dirrm share/icons/Crux/96x96/filesystems +@dirrm share/icons/Crux/96x96/emblems +@dirrm share/icons/Crux/96x96 +@dirrm share/icons/Crux/72x72/filesystems +@dirrm share/icons/Crux/72x72/emblems +@dirrm share/icons/Crux/72x72 +@dirrm share/icons/Crux/48x48/filesystems +@dirrm share/icons/Crux/48x48/emblems +@dirrm share/icons/Crux/48x48 +@dirrm share/icons/Crux/36x36/filesystems +@dirrm share/icons/Crux/36x36 +@dirrm share/icons/Crux/24x24/filesystems +@dirrm share/icons/Crux/24x24 +@dirrm share/icons/Crux/20x20/filesystems +@dirrm share/icons/Crux/20x20 +@dirrm share/icons/Crux/192x192/filesystems +@dirrm share/icons/Crux/192x192 +@dirrm share/icons/Crux/12x12/filesystems +@dirrm share/icons/Crux/12x12 +@dirrm share/icons/Crux +@dirrm share/gnome/themes/Smokey/metacity-1 +@dirrm share/gnome/themes/Smokey +@dirrm share/gnome/themes/Sandwish/metacity-1 +@dirrm share/gnome/themes/Sandwish +@dirrm share/gnome/themes/Mist/metacity-1 +@dirrm share/gnome/themes/Mist +@dirrm share/eazel-engine @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile index c0142e498200..649e67dcae87 100644 --- a/x11-toolkits/gtk-engines2/Makefile +++ b/x11-toolkits/gtk-engines2/Makefile @@ -6,22 +6,24 @@ # PORTNAME= gtk-engines2 -PORTVERSION= 1.9.0 +PORTVERSION= 2.2.0 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gtk-engines/1.9 -DISTNAME= gtk-engines-${PORTVERSION} +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes USE_LIBTOOL= yes +USE_GNOMENG= yes +USE_GNOME= gnomehack CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -PLIST_SUB= VERSION=2.0.0 +PLIST_SUB= VERSION=2.2.0 THEMES= metal redmond95 diff --git a/x11-toolkits/gtk-engines2/distinfo b/x11-toolkits/gtk-engines2/distinfo index a025fd2ab81a..6e6b48e93ec1 100644 --- a/x11-toolkits/gtk-engines2/distinfo +++ b/x11-toolkits/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk-engines-1.9.0.tar.bz2) = d77b10a9e73226a306a32d5c89ba066d +MD5 (gnome2/gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263 diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist index 1888a2ba8fcd..39f05f6c3a84 100644 --- a/x11-toolkits/gtk-engines2/pkg-plist +++ b/x11-toolkits/gtk-engines2/pkg-plist @@ -1,10 +1,9 @@ lib/gtk-2.0/%%VERSION%%/engines/libmetal.so lib/gtk-2.0/%%VERSION%%/engines/libpixmap.so lib/gtk-2.0/%%VERSION%%/engines/libredmond95.so -share/themes/Metal/ICON.png +libdata/pkgconfig/gtk-engines-2.pc share/themes/Metal/README.html share/themes/Metal/gtk-2.0/gtkrc -share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk-2.0/gtkrc @dirrm share/themes/Redmond95/gtk-2.0 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index b476e968af4a..0c008a6dba21 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,9 +6,9 @@ # PORTNAME= gtk -PORTVERSION= 2.0.9 +PORTVERSION= 2.2.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -21,8 +21,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \ - pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \ +LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \ + pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg @@ -33,23 +33,28 @@ USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes -USE_GNOMENG= yes -USE_GNOME= gnomehack INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static \ - --with-xinput=xfree +USE_GNOMENG= yes +USE_GNOME= gnomehack +CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -PLIST_SUB= GTK_VERSION="2.0.0" +PLIST_SUB= GTK_VERSION="2.2.0" MAN1= gdk-pixbuf-csource.1 -post-extract: +post-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|Xft\.h|Xft2.h|g' + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index e289dc9500c9..72dd41ecd3b7 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2 +MD5 (gnome2/gtk+-2.2.1.tar.bz2) = dfd5755fddb26a46c96bfaa813280ac4 diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae index 591824a7d638..f195f07b43c6 100644 --- a/x11-toolkits/gtk20/files/patch-ae +++ b/x11-toolkits/gtk20/files/patch-ae @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Thu May 23 17:20:40 2002 -+++ configure Sat Jun 1 14:26:00 2002 -@@ -7192,6 +7192,7 @@ +--- configure.orig Wed Dec 11 18:31:51 2002 ++++ configure Thu Dec 12 12:07:17 2002 +@@ -7414,6 +7414,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,12 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10107,7 +10108,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag index b3df848c80aa..b0be157797ed 100644 --- a/x11-toolkits/gtk20/files/patch-ag +++ b/x11-toolkits/gtk20/files/patch-ag @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gtk/Makefile.in.orig Sat Jun 1 14:27:02 2002 -+++ gtk/Makefile.in Sat Jun 1 14:29:10 2002 -@@ -182,7 +182,7 @@ +--- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002 ++++ gtk/Makefile.in Thu Dec 12 12:08:43 2002 +@@ -183,7 +183,7 @@ -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ -DGTK_VERSION=\"@GTK_VERSION@\" \ -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ + -DGTK_HOST=\"@host@\" \ diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 143e7096e46e..b9b4f883a8e2 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,10 +1,14 @@ bin/gdk-pixbuf-csource bin/gtk-query-immodules-2.0 +bin/gdk-pixbuf-query-loaders +etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h @@ -12,6 +16,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h +include/gtk-2.0/gdk/gdkdisplay.h +include/gtk-2.0/gdk/gdkdisplaymanager.h include/gtk-2.0/gdk/gdkdnd.h include/gtk-2.0/gdk/gdkdrawable.h include/gtk-2.0/gdk/gdkenumtypes.h @@ -30,6 +36,7 @@ include/gtk-2.0/gdk/gdkprivate.h include/gtk-2.0/gdk/gdkproperty.h include/gtk-2.0/gdk/gdkregion.h include/gtk-2.0/gdk/gdkrgb.h +include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h @@ -181,6 +188,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so @@ -205,16 +213,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.0 +lib/libgdk-x11-2.0.so.200 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.0 +lib/libgdk_pixbuf-2.0.so.200 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.0 +lib/libgdk_pixbuf_xlib-2.0.so.200 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.0 +lib/libgtk-x11-2.0.so.200 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -223,7 +231,6 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20.mo @@ -253,6 +260,8 @@ share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mk/LC_MESSAGES/gtk20.mo +share/locale/mn/LC_MESSAGES/gtk20.mo share/locale/ms/LC_MESSAGES/gtk20.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20.mo @@ -267,6 +276,7 @@ share/locale/sl/LC_MESSAGES/gtk20.mo share/locale/sp/LC_MESSAGES/gtk20.mo share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo +share/locale/ta/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/vi/LC_MESSAGES/gtk20.mo diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index b476e968af4a..0c008a6dba21 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,9 +6,9 @@ # PORTNAME= gtk -PORTVERSION= 2.0.9 +PORTVERSION= 2.2.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.0,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ @@ -21,8 +21,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= atk-1.0.0:${PORTSDIR}/devel/atk \ - pango-1.0.0:${PORTSDIR}/x11-toolkits/pango \ +LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \ + pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ jpeg.9:${PORTSDIR}/graphics/jpeg @@ -33,23 +33,28 @@ USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes -USE_GNOMENG= yes -USE_GNOME= gnomehack INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --enable-static \ - --with-xinput=xfree +USE_GNOMENG= yes +USE_GNOME= gnomehack +CONFIGURE_ARGS= --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -PLIST_SUB= GTK_VERSION="2.0.0" +PLIST_SUB= GTK_VERSION="2.2.0" MAN1= gdk-pixbuf-csource.1 -post-extract: +post-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${GREP} -l lgmodule | \ xargs ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g' + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|Xft\.h|Xft2.h|g' + @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index e289dc9500c9..72dd41ecd3b7 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gnome2/gtk+-2.0.9.tar.bz2) = 9827bca97fc09ff62b75579614dcfeb2 +MD5 (gnome2/gtk+-2.2.1.tar.bz2) = dfd5755fddb26a46c96bfaa813280ac4 diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae index 591824a7d638..f195f07b43c6 100644 --- a/x11-toolkits/gtk30/files/patch-ae +++ b/x11-toolkits/gtk30/files/patch-ae @@ -1,9 +1,6 @@ - -$FreeBSD$ - ---- configure.orig Thu May 23 17:20:40 2002 -+++ configure Sat Jun 1 14:26:00 2002 -@@ -7192,6 +7192,7 @@ +--- configure.orig Wed Dec 11 18:31:51 2002 ++++ configure Thu Dec 12 12:07:17 2002 +@@ -7414,6 +7414,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -11,12 +8,3 @@ $FreeBSD$ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -10107,7 +10108,7 @@ - echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag index b3df848c80aa..b0be157797ed 100644 --- a/x11-toolkits/gtk30/files/patch-ag +++ b/x11-toolkits/gtk30/files/patch-ag @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- gtk/Makefile.in.orig Sat Jun 1 14:27:02 2002 -+++ gtk/Makefile.in Sat Jun 1 14:29:10 2002 -@@ -182,7 +182,7 @@ +--- gtk/Makefile.in.orig Thu Dec 12 12:07:53 2002 ++++ gtk/Makefile.in Thu Dec 12 12:08:43 2002 +@@ -183,7 +183,7 @@ -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_LIBDIR=\"$(libdir)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ - -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_LOCALEDIR=\"$(gtklocaledir)\" \ -DGTK_VERSION=\"@GTK_VERSION@\" \ -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\" \ + -DGTK_HOST=\"@host@\" \ diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 143e7096e46e..b9b4f883a8e2 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,10 +1,14 @@ bin/gdk-pixbuf-csource bin/gtk-query-immodules-2.0 +bin/gdk-pixbuf-query-loaders +etc/gtk-2.0/gdk-pixbuf.loaders etc/gtk-2.0/gtk.immodules include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h include/gtk-2.0/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-animation.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-enum-types.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-features.h +include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-io.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-loader.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf-marshal.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h @@ -12,6 +16,8 @@ include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h +include/gtk-2.0/gdk/gdkdisplay.h +include/gtk-2.0/gdk/gdkdisplaymanager.h include/gtk-2.0/gdk/gdkdnd.h include/gtk-2.0/gdk/gdkdrawable.h include/gtk-2.0/gdk/gdkenumtypes.h @@ -30,6 +36,7 @@ include/gtk-2.0/gdk/gdkprivate.h include/gtk-2.0/gdk/gdkproperty.h include/gtk-2.0/gdk/gdkregion.h include/gtk-2.0/gdk/gdkrgb.h +include/gtk-2.0/gdk/gdkscreen.h include/gtk-2.0/gdk/gdkselection.h include/gtk-2.0/gdk/gdktypes.h include/gtk-2.0/gdk/gdkvisual.h @@ -181,6 +188,7 @@ include/gtk-2.0/gtk/gtkvscrollbar.h include/gtk-2.0/gtk/gtkvseparator.h include/gtk-2.0/gtk/gtkwidget.h include/gtk-2.0/gtk/gtkwindow.h +lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ani.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-bmp.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-gif.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-ico.so @@ -205,16 +213,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-viqr.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-xim.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.0 +lib/libgdk-x11-2.0.so.200 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.0 +lib/libgdk_pixbuf-2.0.so.200 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.0 +lib/libgdk_pixbuf_xlib-2.0.so.200 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.0 +lib/libgtk-x11-2.0.so.200 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -223,7 +231,6 @@ libdata/pkgconfig/gtk+-2.0.pc libdata/pkgconfig/gtk+-x11-2.0.pc share/aclocal/gtk-2.0.m4 share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20.mo share/locale/be/LC_MESSAGES/gtk20.mo share/locale/bg/LC_MESSAGES/gtk20.mo @@ -253,6 +260,8 @@ share/locale/ja/LC_MESSAGES/gtk20.mo share/locale/ko/LC_MESSAGES/gtk20.mo share/locale/lt/LC_MESSAGES/gtk20.mo share/locale/lv/LC_MESSAGES/gtk20.mo +share/locale/mk/LC_MESSAGES/gtk20.mo +share/locale/mn/LC_MESSAGES/gtk20.mo share/locale/ms/LC_MESSAGES/gtk20.mo share/locale/nl/LC_MESSAGES/gtk20.mo share/locale/nn/LC_MESSAGES/gtk20.mo @@ -267,6 +276,7 @@ share/locale/sl/LC_MESSAGES/gtk20.mo share/locale/sp/LC_MESSAGES/gtk20.mo share/locale/sr/LC_MESSAGES/gtk20.mo share/locale/sv/LC_MESSAGES/gtk20.mo +share/locale/ta/LC_MESSAGES/gtk20.mo share/locale/tr/LC_MESSAGES/gtk20.mo share/locale/uk/LC_MESSAGES/gtk20.mo share/locale/vi/LC_MESSAGES/gtk20.mo diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile index 8d2d9d44575a..6ab877a337cf 100644 --- a/x11-toolkits/libbonoboui/Makefile +++ b/x11-toolkits/libbonoboui/Makefile @@ -6,16 +6,16 @@ # PORTNAME= libbonoboui -PORTVERSION= 2.0.3.3 +PORTVERSION= 2.2.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas \ - gnome-2.0:${PORTSDIR}/x11/libgnome +LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas \ + gnome-2.200:${PORTSDIR}/x11/libgnome USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-toolkits/libbonoboui/distinfo b/x11-toolkits/libbonoboui/distinfo index ea7c39b5db44..71c72347e16b 100644 --- a/x11-toolkits/libbonoboui/distinfo +++ b/x11-toolkits/libbonoboui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libbonoboui-2.0.3.3.tar.bz2) = 2ae0f5ea9567a6e6bca80df4156978fc +MD5 (gnome2/libbonoboui-2.2.0.tar.bz2) = e3a5090990f0dcf88aa1e8e8cea74e4f diff --git a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c b/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c deleted file mode 100644 index 7d93d259360a..000000000000 --- a/x11-toolkits/libbonoboui/files/patch-bonobo_bonobo-ui-util.c +++ /dev/null @@ -1,18 +0,0 @@ ---- bonobo/bonobo-ui-util.c.orig Mon Sep 2 11:24:00 2002 -+++ bonobo/bonobo-ui-util.c Sat Nov 16 16:38:54 2002 -@@ -539,11 +539,10 @@ - GNOME_PARAM_GNOME_PREFIX, &prefix, NULL); - } - -- /* sub-optimal, but what can you do */ -- if (prefix) -- datadir = g_strdup_printf ("%s/share", prefix); -- else -- datadir = g_strdup (BONOBO_DATADIR); -+ g_object_get (G_OBJECT (gnome_program_get ()), -+ GNOME_PARAM_APP_DATADIR, &datadir, NULL); -+ if (!datadir) -+ datadir = g_strdup (BONOBO_DATADIR); - - cl->program = gnome_program_init ( - doc_id, "2.1", diff --git a/x11-toolkits/libbonoboui/files/patch-configure b/x11-toolkits/libbonoboui/files/patch-configure index b963f8bcce5c..e33f9e6ceb4e 100644 --- a/x11-toolkits/libbonoboui/files/patch-configure +++ b/x11-toolkits/libbonoboui/files/patch-configure @@ -1,6 +1,9 @@ ---- configure.orig Fri Oct 18 07:23:27 2002 -+++ configure Fri Nov 1 16:08:44 2002 -@@ -7235,6 +7235,7 @@ + +$FreeBSD$ + +--- configure 2002/04/26 11:11:58 1.1 ++++ configure 2002/04/26 11:12:23 +@@ -7013,6 +7013,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" diff --git a/x11-toolkits/libbonoboui/pkg-plist b/x11-toolkits/libbonoboui/pkg-plist index f97a23354ee4..3a29cf390d36 100644 --- a/x11-toolkits/libbonoboui/pkg-plist +++ b/x11-toolkits/libbonoboui/pkg-plist @@ -46,11 +46,13 @@ share/locale/be/LC_MESSAGES/libbonoboui-2.0.mo share/locale/bg/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ca/LC_MESSAGES/libbonoboui-2.0.mo share/locale/cs/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/da/LC_MESSAGES/libbonoboui-2.0.mo share/locale/de/LC_MESSAGES/libbonoboui-2.0.mo share/locale/el/LC_MESSAGES/libbonoboui-2.0.mo share/locale/es/LC_MESSAGES/libbonoboui-2.0.mo share/locale/fi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/fr/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/he/LC_MESSAGES/libbonoboui-2.0.mo share/locale/hi/LC_MESSAGES/libbonoboui-2.0.mo share/locale/hu/LC_MESSAGES/libbonoboui-2.0.mo share/locale/it/LC_MESSAGES/libbonoboui-2.0.mo @@ -58,6 +60,7 @@ share/locale/ja/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ko/LC_MESSAGES/libbonoboui-2.0.mo share/locale/lv/LC_MESSAGES/libbonoboui-2.0.mo share/locale/ms/LC_MESSAGES/libbonoboui-2.0.mo +share/locale/nl/LC_MESSAGES/libbonoboui-2.0.mo share/locale/nn/LC_MESSAGES/libbonoboui-2.0.mo share/locale/no/LC_MESSAGES/libbonoboui-2.0.mo share/locale/pl/LC_MESSAGES/libbonoboui-2.0.mo diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile index 1e2f5d4cd2f5..dda56c9df969 100644 --- a/x11-toolkits/libgail-gnome/Makefile +++ b/x11-toolkits/libgail-gnome/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgail-gnome PORTVERSION= 1.0.2 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 @@ -14,8 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - spi.1:${PORTSDIR}/x11-toolkits/at-spi +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + spi.8:${PORTSDIR}/x11-toolkits/at-spi USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 20a3f9a65579..a4facd7dfcbd 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,16 +6,16 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 1.116.3 +PORTVERSION= 2.2.1.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.116 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeprint-2.0:${PORTSDIR}/print/libgnomeprint \ - gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas +LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \ + gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas USE_BZIP2= yes USE_X_PREFIX= yes @@ -25,7 +25,7 @@ USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack USE_REINPLACE= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes USE_BISON= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index 9e71a6a29887..03477a7f497c 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeprintui-1.116.3.tar.bz2) = 4db8d9c405ab9717861463b333c01366 +MD5 (gnome2/libgnomeprintui-2.2.1.1.tar.bz2) = fda6586628c60693295b81cc3576ca23 diff --git a/x11-toolkits/libgnomeprintui/files/patch-configure b/x11-toolkits/libgnomeprintui/files/patch-configure new file mode 100644 index 000000000000..188be53fea84 --- /dev/null +++ b/x11-toolkits/libgnomeprintui/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Tue Dec 10 22:29:55 2002 ++++ configure Tue Dec 10 22:30:17 2002 +@@ -8158,6 +8158,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 07649de3e14a..c89a4928adb1 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -1,40 +1,70 @@ -include/libgnomeprintui-2.0/libgnomeprintui/gnome-font-dialog.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-copies.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-dialog.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-master-preview.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-paper-selector.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-preview.h -include/libgnomeprintui-2.0/libgnomeprintui/gnome-printer-dialog.h -lib/libgnomeprintui-2.a -lib/libgnomeprintui-2.so -lib/libgnomeprintui-2.so.0 -libdata/pkgconfig/libgnomeprintui-2.0.pc -share/locale/am/LC_MESSAGES/libgnomeprintui.mo -share/locale/az/LC_MESSAGES/libgnomeprintui.mo -share/locale/be/LC_MESSAGES/libgnomeprintui.mo -share/locale/bg/LC_MESSAGES/libgnomeprintui.mo -share/locale/ca/LC_MESSAGES/libgnomeprintui.mo -share/locale/cs/LC_MESSAGES/libgnomeprintui.mo -share/locale/da/LC_MESSAGES/libgnomeprintui.mo -share/locale/de/LC_MESSAGES/libgnomeprintui.mo -share/locale/el/LC_MESSAGES/libgnomeprintui.mo -share/locale/es/LC_MESSAGES/libgnomeprintui.mo -share/locale/et/LC_MESSAGES/libgnomeprintui.mo -share/locale/eu/LC_MESSAGES/libgnomeprintui.mo -share/locale/hi/LC_MESSAGES/libgnomeprintui.mo -share/locale/ko/LC_MESSAGES/libgnomeprintui.mo -share/locale/lv/LC_MESSAGES/libgnomeprintui.mo -share/locale/ms/LC_MESSAGES/libgnomeprintui.mo -share/locale/pl/LC_MESSAGES/libgnomeprintui.mo -share/locale/pt/LC_MESSAGES/libgnomeprintui.mo -share/locale/ro/LC_MESSAGES/libgnomeprintui.mo -share/locale/ru/LC_MESSAGES/libgnomeprintui.mo -share/locale/sl/LC_MESSAGES/libgnomeprintui.mo -share/locale/sv/LC_MESSAGES/libgnomeprintui.mo -share/locale/ta/LC_MESSAGES/libgnomeprintui.mo -share/locale/vi/LC_MESSAGES/libgnomeprintui.mo -share/locale/wa/LC_MESSAGES/libgnomeprintui.mo -share/locale/zh_CN/LC_MESSAGES/libgnomeprintui.mo -share/locale/zh_TW/LC_MESSAGES/libgnomeprintui.mo -@dirrm include/libgnomeprintui-2.0/libgnomeprintui -@dirrm include/libgnomeprintui-2.0 +include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h +include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h +lib/libgnomeprintui-2-2.a +lib/libgnomeprintui-2-2.so +lib/libgnomeprintui-2-2.so.0 +libdata/pkgconfig/libgnomeprintui-2.2.pc +share/doc/libgnomeprintui/c7.html +share/doc/libgnomeprintui/index.html +share/doc/libgnomeprintui/index.sgml +share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html +share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html +share/doc/libgnomeprintui/libgnomeprintui.html +share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/he/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/hi/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/hr/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/hu/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo +share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo +@dirrm share/doc/libgnomeprintui +@dirrm include/libgnomeprintui-2.2/libgnomeprintui +@dirrm include/libgnomeprintui-2.2 diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 00f4eb3e66c8..6a2da9db23c0 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,16 +6,17 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.0.6 -PORTREVISION= 1 +PORTVERSION= 2.2.0.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS+= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui +LIB_DEPENDS+= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification +RUN_DEPENDS= ${X11BASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index 16327a337d4c..7014f72c327e 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnomeui-2.0.6.tar.bz2) = 5915cc352f3c89705f9dc5d73a6a2600 +MD5 (gnome2/libgnomeui-2.2.0.1.tar.bz2) = f8cb4ecb5058e59a2df11a007323ae91 diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in index a0bf02e31068..5eb473f9c1d8 100644 --- a/x11-toolkits/libgnomeui/files/patch-Makefile.in +++ b/x11-toolkits/libgnomeui/files/patch-Makefile.in @@ -1,8 +1,8 @@ ---- Makefile.in.orig Fri May 17 20:27:51 2002 -+++ Makefile.in Fri May 17 20:29:00 2002 -@@ -115,7 +115,7 @@ - VERSION = @VERSION@ - YACC = @YACC@ +--- Makefile.in.orig Sat Nov 9 02:33:58 2002 ++++ Makefile.in Sat Nov 9 02:36:36 2002 +@@ -122,7 +122,7 @@ + cxxflags_set = @cxxflags_set@ + gnomelocaledir = @gnomelocaledir@ -SUBDIRS = libgnomeui glade images demos test-gnome doc po #tests +SUBDIRS = libgnomeui glade images demos doc po #tests diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in new file mode 100644 index 000000000000..4aa372f11bb9 --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in @@ -0,0 +1,11 @@ +--- libgnomeui/Makefile.in.orig Sat Nov 9 02:37:09 2002 ++++ libgnomeui/Makefile.in Sat Nov 9 02:38:38 2002 +@@ -150,7 +150,7 @@ + -DGNOMEUILIBDIR=\""$(libdir)"\" \ + -DGNOMEUIDATADIR=\""$(datadir)"\" \ + -DGNOMEUIPIXMAPDIR=\""$(datadir)/pixmaps"\" \ +- -DGNOMEUIICONDIR=\""$(datadir)/icons"\" \ ++ -DGNOMEUIICONDIR=\""$(prefix)/share/icons"\" \ + -DGNOMEUISERVERDIR=\""$(libexecdir)"\" \ + -DGNOMEUILOCALSTATEDIR=\""$(localstatedir)"\" \ + -DGNOMEUILOCALEDIR=\""$(gnomelocaledir)"\" \ diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index aafe82e641c8..77f82ec0b27a 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -21,7 +21,9 @@ include/libgnomeui-2.0/libgnomeui/gnome-ice.h include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h include/libgnomeui-2.0/libgnomeui/gnome-icon-item.h include/libgnomeui-2.0/libgnomeui/gnome-icon-list.h +include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h include/libgnomeui-2.0/libgnomeui/gnome-icon-sel.h +include/libgnomeui-2.0/libgnomeui/gnome-icon-theme.h include/libgnomeui-2.0/libgnomeui/gnome-mdi-child.h include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h @@ -33,6 +35,8 @@ include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h include/libgnomeui-2.0/libgnomeui/gnome-propertybox.h include/libgnomeui-2.0/libgnomeui/gnome-scores.h include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h +include/libgnomeui-2.0/libgnomeui/gnome-theme-parser.h +include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h include/libgnomeui-2.0/libgnomeui/gnome-types.h include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h @@ -44,10 +48,14 @@ include/libgnomeui-2.0/libgnomeui/libgnomeui.h lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.0 +lib/libgnomeui-2.so.200 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 +share/doc/libgnomeui/application-mgmt.html share/doc/libgnomeui/c4.html +share/doc/libgnomeui/deprecated.html +share/doc/libgnomeui/druids.html +share/doc/libgnomeui/fixme.html share/doc/libgnomeui/gnomeabout.html share/doc/libgnomeui/gnomeapp.html share/doc/libgnomeui/gnomeappbar.html @@ -79,6 +87,9 @@ share/doc/libgnomeui/index.sgml share/doc/libgnomeui/libgnomeui-gnome-app-helper.html share/doc/libgnomeui/libgnomeui-gnome-app-util.html share/doc/libgnomeui/libgnomeui-gnome-dialog-util.html +share/doc/libgnomeui/libgnomeui-gnome-gconf-ui.html +share/doc/libgnomeui/libgnomeui-gnome-ice.html +share/doc/libgnomeui/libgnomeui-gnome-macros.html share/doc/libgnomeui/libgnomeui-gnome-mdi-session.html share/doc/libgnomeui/libgnomeui-gnome-popup-menu.html share/doc/libgnomeui/libgnomeui-gnome-stock-icons.html @@ -87,12 +98,54 @@ share/doc/libgnomeui/libgnomeui-gnome-ui-init.html share/doc/libgnomeui/libgnomeui-gnome-uidefs.html share/doc/libgnomeui/libgnomeui-gnome-vfs-util.html share/doc/libgnomeui/libgnomeui-gnome-window.html +share/doc/libgnomeui/libgnomeui-gnomeabout.html +share/doc/libgnomeui/libgnomeui-gnomeapp.html +share/doc/libgnomeui/libgnomeui-gnomeappbar.html +share/doc/libgnomeui/libgnomeui-gnomeclient.html +share/doc/libgnomeui/libgnomeui-gnomecolorpicker.html +share/doc/libgnomeui/libgnomeui-gnomedateedit.html +share/doc/libgnomeui/libgnomeui-gnomedialog.html +share/doc/libgnomeui/libgnomeui-gnomedruid.html +share/doc/libgnomeui/libgnomeui-gnomedruidpage.html +share/doc/libgnomeui/libgnomeui-gnomedruidpageedge.html +share/doc/libgnomeui/libgnomeui-gnomedruidpagestandard.html +share/doc/libgnomeui/libgnomeui-gnomeentry.html +share/doc/libgnomeui/libgnomeui-gnomefileentry.html +share/doc/libgnomeui/libgnomeui-gnomefontpicker.html +share/doc/libgnomeui/libgnomeui-gnomehref.html +share/doc/libgnomeui/libgnomeui-gnomeiconentry.html +share/doc/libgnomeui/libgnomeui-gnomeiconlist.html +share/doc/libgnomeui/libgnomeui-gnomeiconlookup.html +share/doc/libgnomeui/libgnomeui-gnomeiconselection.html +share/doc/libgnomeui/libgnomeui-gnomeicontheme.html +share/doc/libgnomeui/libgnomeui-gnomemdi.html +share/doc/libgnomeui/libgnomeui-gnomemdichild.html +share/doc/libgnomeui/libgnomeui-gnomemdigenericchild.html +share/doc/libgnomeui/libgnomeui-gnomemessagebox.html +share/doc/libgnomeui/libgnomeui-gnomepixmap.html +share/doc/libgnomeui/libgnomeui-gnomepixmapentry.html +share/doc/libgnomeui/libgnomeui-gnomepropertybox.html +share/doc/libgnomeui/libgnomeui-gnomescores.html +share/doc/libgnomeui/libgnomeui-gnomethemefile.html +share/doc/libgnomeui/libgnomeui-gnomethumbnail.html share/doc/libgnomeui/libgnomeui-gnometypebuiltins.html share/doc/libgnomeui/libgnomeui-objects.html +share/doc/libgnomeui/miscellaneous.html +share/doc/libgnomeui/x1427.html share/doc/libgnomeui/x1495.html +share/doc/libgnomeui/x15441.html +share/doc/libgnomeui/x15454.html +share/doc/libgnomeui/x15523.html share/doc/libgnomeui/x15980.html +share/doc/libgnomeui/x17879.html +share/doc/libgnomeui/x17892.html +share/doc/libgnomeui/x17961.html share/doc/libgnomeui/x18473.html +share/doc/libgnomeui/x6079.html +share/doc/libgnomeui/x6088.html share/doc/libgnomeui/x6263.html +share/doc/libgnomeui/x7838.html +share/doc/libgnomeui/x7859.html share/doc/libgnomeui/x8080.html share/gnome/pixmaps/gnome-about-logo.png share/gnome/pixmaps/gnome-default-dlg.png @@ -100,8 +153,9 @@ share/gnome/pixmaps/gnome-error.png share/gnome/pixmaps/gnome-info.png share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png -share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo share/locale/am/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/az/LC_MESSAGES/libgnomeui-2.0.mo share/locale/be/LC_MESSAGES/libgnomeui-2.0.mo share/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ca/LC_MESSAGES/libgnomeui-2.0.mo @@ -114,6 +168,7 @@ share/locale/es/LC_MESSAGES/libgnomeui-2.0.mo share/locale/et/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/he/LC_MESSAGES/libgnomeui-2.0.mo share/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo share/locale/it/LC_MESSAGES/libgnomeui-2.0.mo @@ -121,7 +176,10 @@ share/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo share/locale/no/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index cc00216d6954..a92e45d31e0a 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,15 +6,16 @@ # PORTNAME= libwnck -PORTVERSION= 0.18 +PORTVERSION= 2.2.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.18 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index d0b7c07fe6bc..0938d6b32c3c 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1 +1 @@ -MD5 (gnome2/libwnck-0.18.tar.bz2) = c79cff043a13e7f07e6a253f597d571d +MD5 (gnome2/libwnck-2.2.1.tar.bz2) = 2cd4dbcd275ccffe877527419c048218 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index d64aca60ed6b..cf49d3a5e6f2 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -11,26 +11,33 @@ include/libwnck-1.0/libwnck/wnck-enum-types.h include/libwnck-1.0/libwnck/workspace.h lib/libwnck-1.a lib/libwnck-1.so -lib/libwnck-1.so.4 +lib/libwnck-1.so.9 libdata/pkgconfig/libwnck-1.0.pc +share/locale/am/LC_MESSAGES/libwnck.mo share/locale/ar/LC_MESSAGES/libwnck.mo share/locale/az/LC_MESSAGES/libwnck.mo +share/locale/be/LC_MESSAGES/libwnck.mo share/locale/bg/LC_MESSAGES/libwnck.mo share/locale/ca/LC_MESSAGES/libwnck.mo +share/locale/cs/LC_MESSAGES/libwnck.mo share/locale/da/LC_MESSAGES/libwnck.mo share/locale/de/LC_MESSAGES/libwnck.mo share/locale/el/LC_MESSAGES/libwnck.mo share/locale/es/LC_MESSAGES/libwnck.mo share/locale/et/LC_MESSAGES/libwnck.mo +share/locale/fa/LC_MESSAGES/libwnck.mo share/locale/fi/LC_MESSAGES/libwnck.mo share/locale/fr/LC_MESSAGES/libwnck.mo share/locale/gl/LC_MESSAGES/libwnck.mo share/locale/he/LC_MESSAGES/libwnck.mo +share/locale/hi/LC_MESSAGES/libwnck.mo share/locale/hu/LC_MESSAGES/libwnck.mo share/locale/it/LC_MESSAGES/libwnck.mo share/locale/ja/LC_MESSAGES/libwnck.mo share/locale/ko/LC_MESSAGES/libwnck.mo share/locale/lv/LC_MESSAGES/libwnck.mo +share/locale/mk/LC_MESSAGES/libwnck.mo +share/locale/mn/LC_MESSAGES/libwnck.mo share/locale/ms/LC_MESSAGES/libwnck.mo share/locale/nl/LC_MESSAGES/libwnck.mo share/locale/nn/LC_MESSAGES/libwnck.mo @@ -38,8 +45,10 @@ share/locale/no/LC_MESSAGES/libwnck.mo share/locale/pl/LC_MESSAGES/libwnck.mo share/locale/pt/LC_MESSAGES/libwnck.mo share/locale/pt_BR/LC_MESSAGES/libwnck.mo +share/locale/ro/LC_MESSAGES/libwnck.mo share/locale/ru/LC_MESSAGES/libwnck.mo share/locale/sk/LC_MESSAGES/libwnck.mo +share/locale/sq/LC_MESSAGES/libwnck.mo share/locale/sl/LC_MESSAGES/libwnck.mo share/locale/sv/LC_MESSAGES/libwnck.mo share/locale/tr/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 93c78b596bad..6b9568835f4a 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -7,7 +7,7 @@ PORTNAME= libzvt PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTREVISION= 6 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \ +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 USE_BZIP2= yes @@ -25,18 +25,15 @@ USE_REINPLACE= yes USE_BISON= yes INSTALLS_SHLIB= yes USE_LIBTOOL= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome +USE_GNOMENG= yes +USE_GNOME= gnomeprefix gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -pre-patch: +post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure - @find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ - 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g ; \ - s|[(]datadir[)]/gnome/|(datadir)/|g' @find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' diff --git a/x11-toolkits/libzvt/files/patch-configure b/x11-toolkits/libzvt/files/patch-configure index 4ad2981352da..c4ddc9ef79ef 100644 --- a/x11-toolkits/libzvt/files/patch-configure +++ b/x11-toolkits/libzvt/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig Sat Nov 30 21:07:06 2002 -+++ configure Sat Nov 30 21:07:31 2002 +--- configure.orig Mon Jun 24 11:41:40 2002 ++++ configure Sat Nov 30 21:02:28 2002 @@ -7115,6 +7115,7 @@ # This can be used to rebuild libtool when needed diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 04de75c35123..0a9b9014751a 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pango -PORTVERSION= 1.0.5 +PORTVERSION= 1.2.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.0,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \ ftp://ftp.gtk.org/pub/gtk/v2.0/ \ ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \ http://www.ameth.org/gimp/gtk/v1.3/ @@ -17,8 +17,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX -LIB_DEPENDS= glib-2.0.0:${PORTSDIR}/devel/glib20 \ - freetype.9:${PORTSDIR}/print/freetype2 \ +LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \ + Xft2.2:${PORTSDIR}/x11-fonts/Xft \ intl.4:${PORTSDIR}/devel/gettext USE_BZIP2= yes @@ -26,9 +26,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes INSTALLS_SHLIB= yes +GNU_CONFIGURE= yes USE_GNOMENG= yes USE_GNOME= gnomehack -GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ --enable-static @@ -42,7 +42,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/freetype2 \ -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -PLIST_SUB= VERSION="1.0.0" +PLIST_SUB= VERSION="1.2.0" .include <bsd.port.pre.mk> @@ -53,7 +53,7 @@ PLIST_SUB+= XFREE4:="" .endif post-patch: - @find ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ + @${FIND} ${WRKSRC}/pango/opentype -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \ 's|internal/tterrors\.h|fterrors.h| ; s|TT_Err_|FT_Err_|g' .include <bsd.port.post.mk> diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 8c60dc1ae795..020067318579 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1 +1 @@ -MD5 (gnome2/pango-1.0.5.tar.bz2) = e300e5c163bc28e180e45c8e20543b4b +MD5 (gnome2/pango-1.2.1.tar.bz2) = 6b354ef14e75739a92b5b78f4ca3165a diff --git a/x11-toolkits/pango/files/patch-ltmain.sh b/x11-toolkits/pango/files/patch-ltmain.sh index ec2f7e4ad88c..e9e312dfe402 100644 --- a/x11-toolkits/pango/files/patch-ltmain.sh +++ b/x11-toolkits/pango/files/patch-ltmain.sh @@ -1,32 +1,15 @@ ---- ltmain.sh.orig Fri Apr 26 05:23:44 2002 -+++ ltmain.sh Wed Jul 3 12:50:12 2002 -@@ -1056,14 +1056,14 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd*|*-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd*|*-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1073,8 +1073,16 @@ +--- ltmain.sh.orig Fri Nov 8 15:40:11 2002 ++++ ltmain.sh Tue Dec 3 18:47:10 2002 +@@ -1082,8 +1082,16 @@ continue ;; + -pthread) -+ compile_command="$compile_command -pthread" -+ finalize_command="$finalize_command -pthread" -+ compiler_flags="$compiler_flags -pthread" -+ continue -+ ;; ++ compile_command="$compile_command -pthread" ++ finalize_command="$finalize_command -pthread" ++ compiler_flags="$compiler_flags -pthread" ++ continue ++ ;; + -module) module=yes @@ -34,7 +17,7 @@ continue ;; -@@ -2399,6 +2407,9 @@ +@@ -2397,6 +2405,9 @@ # problems, so we reset it completely verstring="" ;; @@ -44,17 +27,7 @@ *) verstring="0.0" ;; -@@ -2502,6 +2513,9 @@ - *-*-openbsd*) - # Do not include libc due to us having libc/libc_r. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4286,10 +4300,12 @@ +@@ -4327,10 +4338,12 @@ fi # Install the pseudo-library for information purposes. diff --git a/x11-toolkits/pango/files/patch-pangoxft.h b/x11-toolkits/pango/files/patch-pangoxft.h new file mode 100644 index 000000000000..939194042b12 --- /dev/null +++ b/x11-toolkits/pango/files/patch-pangoxft.h @@ -0,0 +1,11 @@ +--- pango/pangoxft.h.orig Sun Oct 6 23:03:37 2002 ++++ pango/pangoxft.h Sun Oct 6 23:03:42 2002 +@@ -31,7 +31,7 @@ + #define _XFT_NO_COMPAT + #define _XFTCOMPAT_H_ + #include <X11/Xlib.h> +-#include <X11/Xft/Xft.h> ++#include <X11/Xft/Xft2.h> + #if defined(XftVersion) && XftVersion >= 20000 + #else + #error "must have Xft version 2 or newer" diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index fe5974b94d84..6b2513e949e4 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -10,6 +10,7 @@ include/pango-1.0/pango/pango-enum-types.h include/pango-1.0/pango/pango-font.h include/pango-1.0/pango/pango-fontmap.h include/pango-1.0/pango/pango-fontset.h +include/pango-1.0/pango/pango-glyph-item.h include/pango-1.0/pango/pango-glyph.h include/pango-1.0/pango/pango-indic.h include/pango-1.0/pango/pango-item.h @@ -25,16 +26,16 @@ include/pango-1.0/pango/pangox.h %%XFREE4:%%include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.0 +lib/libpango-1.0.so.200 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.0 +lib/libpangoft2-1.0.so.200 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.0 +lib/libpangox-1.0.so.200 %%XFREE4:%%lib/libpangoxft-1.0.a %%XFREE4:%%lib/libpangoxft-1.0.so -%%XFREE4:%%lib/libpangoxft-1.0.so.0 +%%XFREE4:%%lib/libpangoxft-1.0.so.200 lib/pango/%%VERSION%%/modules/pango-arabic-ft2.so lib/pango/%%VERSION%%/modules/pango-arabic-x.so %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-arabic-xft.so @@ -45,42 +46,47 @@ lib/pango/%%VERSION%%/modules/pango-bengali-x.so lib/pango/%%VERSION%%/modules/pango-devanagari-x.so lib/pango/%%VERSION%%/modules/pango-gujarati-x.so lib/pango/%%VERSION%%/modules/pango-gurmukhi-x.so +%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hangul-xft.so lib/pango/%%VERSION%%/modules/pango-hangul-x.so lib/pango/%%VERSION%%/modules/pango-hebrew-ft2.so lib/pango/%%VERSION%%/modules/pango-hebrew-x.so %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-hebrew-xft.so +%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-indic-xft.so lib/pango/%%VERSION%%/modules/pango-myanmar-x.so lib/pango/%%VERSION%%/modules/pango-tamil-x.so -%%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-tamil-xft.so lib/pango/%%VERSION%%/modules/pango-thai-x.so %%XFREE4:%%lib/pango/%%VERSION%%/modules/pango-thai-xft.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc %%XFREE4:%%libdata/pkgconfig/pangoxft.pc +share/doc/pango/home.png share/doc/pango/index.html share/doc/pango/index.sgml share/doc/pango/layout.gif +share/doc/pango/left.png share/doc/pango/lowlevel.html -share/doc/pango/pango-coverage-maps.html -share/doc/pango/pango-engines.html -share/doc/pango/pango-fonts.html -share/doc/pango/pango-freetype-fonts-and-rendering.html -share/doc/pango/pango-glyph-storage.html -share/doc/pango/pango-indic-engine-support.html -share/doc/pango/pango-layout-objects.html -share/doc/pango/pango-modules.html -share/doc/pango/pango-opentype-font-handling.html -share/doc/pango/pango-tab-stops.html -share/doc/pango/pango-text-attributes.html -share/doc/pango/pango-text-processing.html -share/doc/pango/pango-win32-fonts-and-rendering.html -share/doc/pango/pango-x-fonts.html -share/doc/pango/pango-x-rendering.html -share/doc/pango/pango-xft-fonts-and-rendering.html +share/doc/pango/PangoMarkupFormat.html +share/doc/pango/pango-Coverage-Maps.html +share/doc/pango/pango-Engines.html +share/doc/pango/pango-Fonts.html +share/doc/pango/pango-FreeType-Fonts-and-Rendering.html +share/doc/pango/pango-Glyph-Storage.html +share/doc/pango/pango-Indic-Engine-Support.html +share/doc/pango/pango-Layout-Objects.html +share/doc/pango/pango-Modules.html +share/doc/pango/pango-OpenType-Font-Handling.html +share/doc/pango/pango-Tab-Stops.html +share/doc/pango/pango-Text-Attributes.html +share/doc/pango/pango-Text-Processing.html +share/doc/pango/pango-Win32-Fonts-and-Rendering.html +share/doc/pango/pango-X-Fonts-and-Rendering.html +share/doc/pango/pango-Xft-Fonts-and-Rendering.html +share/doc/pango/pango.devhelp share/doc/pango/pango.html -share/doc/pango/pangomarkupformat.html share/doc/pango/rendering.html +share/doc/pango/right.png +share/doc/pango/up.png @dirrm share/doc/pango @dirrm lib/pango/%%VERSION%%/modules @dirrm lib/pango/%%VERSION%% diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 7d1a4aa03c2a..a997e5bb8433 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -6,7 +6,7 @@ # PORTNAME= vte -PORTVERSION= 0.10.11 +PORTVERSION= 0.10.17 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10 @@ -14,7 +14,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 +LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 USE_BZIP2= yes USE_X_PREFIX= yes @@ -35,6 +35,10 @@ post-patch: s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \ ${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c + @${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \ + ${WRKSRC}/src/vte.c + @${REINPLACE_CMD} -Ee '/^(libvte_la_LIBADD|vte_LDADD)/s/(.*)/\1 -lXft2/' \ + ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ ${WRKSRC}/po/Makefile.in.in diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo index b9901b8f3a2a..a566ee067895 100644 --- a/x11-toolkits/vte/distinfo +++ b/x11-toolkits/vte/distinfo @@ -1 +1 @@ -MD5 (gnome2/vte-0.10.11.tar.bz2) = 457569d09306fd9d6fbe2b11db8b6a2e +MD5 (gnome2/vte-0.10.17.tar.bz2) = db4f0e903c3912827a40de80b5e8e548 diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c index 7ed434ebbe99..16012c800304 100644 --- a/x11-toolkits/vte/files/patch-src_keymap.c +++ b/x11-toolkits/vte/files/patch-src_keymap.c @@ -2,7 +2,7 @@ +++ src/keymap.c Tue Oct 22 17:42:33 2002 @@ -18,6 +18,7 @@ - #ident "$Id: keymap.c,v 1.5 2002/10/18 20:53:53 nalin Exp $" + #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $" #include "../config.h" +#include <sys/types.h> #include <stdlib.h> diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist index 45ac2512eed6..4da275693c7a 100644 --- a/x11-toolkits/vte/pkg-plist +++ b/x11-toolkits/vte/pkg-plist @@ -18,26 +18,36 @@ lib/vte/window libdata/pkgconfig/vte.pc libexec/gnome-pty-helper share/gnome/vte/termcap/xterm +share/locale/am/LC_MESSAGES/vte.mo share/locale/bg/LC_MESSAGES/vte.mo share/locale/ca/LC_MESSAGES/vte.mo share/locale/cs/LC_MESSAGES/vte.mo share/locale/da/LC_MESSAGES/vte.mo share/locale/de/LC_MESSAGES/vte.mo +share/locale/el/LC_MESSAGES/vte.mo share/locale/es/LC_MESSAGES/vte.mo share/locale/fi/LC_MESSAGES/vte.mo share/locale/fr/LC_MESSAGES/vte.mo share/locale/he/LC_MESSAGES/vte.mo +share/locale/hu/LC_MESSAGES/vte.mo +share/locale/ko/LC_MESSAGES/vte.mo share/locale/lv/LC_MESSAGES/vte.mo +share/locale/mn/LC_MESSAGES/vte.mo share/locale/ms/LC_MESSAGES/vte.mo share/locale/nl/LC_MESSAGES/vte.mo share/locale/no/LC_MESSAGES/vte.mo +share/locale/ro/LC_MESSAGES/vte.mo share/locale/pl/LC_MESSAGES/vte.mo +share/locale/pt/LC_MESSAGES/vte.mo share/locale/pt_BR/LC_MESSAGES/vte.mo share/locale/ru/LC_MESSAGES/vte.mo +share/locale/sl/LC_MESSAGES/vte.mo share/locale/sk/LC_MESSAGES/vte.mo share/locale/sv/LC_MESSAGES/vte.mo +share/locale/tr/LC_MESSAGES/vte.mo share/locale/uk/LC_MESSAGES/vte.mo share/locale/vi/LC_MESSAGES/vte.mo +share/locale/zh_CN/LC_MESSAGES/vte.mo share/locale/zh_TW/LC_MESSAGES/vte.mo @dirrm share/gnome/vte/termcap @dirrm share/gnome/vte diff --git a/x11-wm/metacity-setup/Makefile b/x11-wm/metacity-setup/Makefile index 62168cc19c1e..825029930cc6 100644 --- a/x11-wm/metacity-setup/Makefile +++ b/x11-wm/metacity-setup/Makefile @@ -7,14 +7,14 @@ PORTNAME= metacity-setup PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= metacity-setup +MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= marcus@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 0c43c68f2c75..aaca2ddc11d1 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -6,7 +6,7 @@ # PORTNAME= metacity -PORTVERSION= 2.4.21 +PORTVERSION= 2.4.34 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4 @@ -15,8 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org LIB_DEPENDS= gconf-2:${PORTSDIR}/devel/gconf2 \ - startup-notification-1.0:${PORTSDIR}/x11/startup-notification \ - glade-2.0.0:${PORTSDIR}/devel/libglade2 + glade-2.0.0:${PORTSDIR}/devel/libglade2 \ + startup-notification-1.0:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_X_PREFIX= yes @@ -25,6 +25,7 @@ USE_REINPLACE= yes USE_LIBTOOL= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index adf25307d809..12d4ccbd5d65 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1 +1 @@ -MD5 (gnome2/metacity-2.4.21.tar.bz2) = 538f19286a5a0e126b4548ab3b24e126 +MD5 (gnome2/metacity-2.4.34.tar.bz2) = 69650ff5719b958b20f9969902f3f68d diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index c6162cc777fc..012d94bf1063 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -112,6 +112,11 @@ share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml +share/gnome/themes/Simple/metacity-1/close.png +share/gnome/themes/Simple/metacity-1/maximize.png +share/gnome/themes/Simple/metacity-1/maximized.png +share/gnome/themes/Simple/metacity-1/metacity-theme-1.xml +share/gnome/themes/Simple/metacity-1/minimize.png share/gnome/wm-properties/metacity.desktop share/locale/am/LC_MESSAGES/metacity.mo share/locale/az/LC_MESSAGES/metacity.mo @@ -121,7 +126,9 @@ share/locale/cs/LC_MESSAGES/metacity.mo share/locale/da/LC_MESSAGES/metacity.mo share/locale/de/LC_MESSAGES/metacity.mo share/locale/el/LC_MESSAGES/metacity.mo +share/locale/en_GB/LC_MESSAGES/metacity.mo share/locale/es/LC_MESSAGES/metacity.mo +share/locale/et/LC_MESSAGES/metacity.mo share/locale/fi/LC_MESSAGES/metacity.mo share/locale/fr/LC_MESSAGES/metacity.mo share/locale/gl/LC_MESSAGES/metacity.mo @@ -132,7 +139,9 @@ share/locale/ja/LC_MESSAGES/metacity.mo share/locale/ko/LC_MESSAGES/metacity.mo share/locale/lv/LC_MESSAGES/metacity.mo share/locale/mk/LC_MESSAGES/metacity.mo +share/locale/mn/LC_MESSAGES/metacity.mo share/locale/ms/LC_MESSAGES/metacity.mo +share/locale/nl/LC_MESSAGES/metacity.mo share/locale/no/LC_MESSAGES/metacity.mo share/locale/pl/LC_MESSAGES/metacity.mo share/locale/pt/LC_MESSAGES/metacity.mo @@ -147,6 +156,8 @@ share/locale/uk/LC_MESSAGES/metacity.mo share/locale/vi/LC_MESSAGES/metacity.mo share/locale/zh_CN/LC_MESSAGES/metacity.mo share/locale/zh_TW/LC_MESSAGES/metacity.mo +@dirrm share/gnome/themes/Simple/metacity-1 +@dirrm share/gnome/themes/Simple @dirrm share/gnome/themes/Metabox/metacity-1 @dirrm share/gnome/themes/Metabox @dirrm share/gnome/themes/AgingGorilla/metacity-1 @@ -159,7 +170,6 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo @dirrm share/gnome/themes/Bright @dirrm share/gnome/themes/Atlanta/metacity-1 @dirrm share/gnome/themes/Atlanta -@dirrm share/gnome/themes @dirrm share/gnome/metacity/icons @dirrm share/gnome/metacity/glade @dirrm share/gnome/metacity diff --git a/x11/gdm2/Makefile b/x11/gdm2/Makefile index 54491b9daae3..1471cf2cc960 100644 --- a/x11/gdm2/Makefile +++ b/x11/gdm2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gdm2 -PORTVERSION= 2.4.0.12 -PORTREVISION= 1 +PORTVERSION= 2.4.1.3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 @@ -16,8 +15,8 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ - rsvg-2.2:${PORTSDIR}/graphics/librsvg2 +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ + rsvg-2.4:${PORTSDIR}/graphics/librsvg2 USE_BZIP2= yes USE_X_PREFIX= yes @@ -56,6 +55,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in post-install: .if !defined(PACKAGE_BUILDING) diff --git a/x11/gdm2/distinfo b/x11/gdm2/distinfo index 9e9c3533acea..07f6ddaaa9b5 100644 --- a/x11/gdm2/distinfo +++ b/x11/gdm2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gdm-2.4.0.12.tar.bz2) = 8aa6e503d4f74de8df32dee28df9a0de +MD5 (gnome2/gdm-2.4.1.3.tar.bz2) = 448769257c5bda3cda48e63869825173 diff --git a/x11/gdm2/files/patch-al b/x11/gdm2/files/patch-al index ee0fb6a8fdfd..6458c9e46ae2 100644 --- a/x11/gdm2/files/patch-al +++ b/x11/gdm2/files/patch-al @@ -1,12 +1,9 @@ ---- config/gnomerc.in.orig Wed Jul 24 15:25:51 2002 -+++ config/gnomerc.in Mon Dec 23 23:53:21 2002 -@@ -2,7 +2,8 @@ +--- config/gnomerc.in.orig Mon Nov 11 10:54:52 2002 ++++ config/gnomerc.in Fri Jan 3 12:09:49 2003 +@@ -9,5 +9,6 @@ + #fi - # Do we have gnome-volume-control? - # If so we should run it to load the gnome-volume-control settings --if command -v gnome-volume-control > /dev/null 2>&1; then + # path takes precedence +LC_CTYPE= ; export LC_CTYPE -+if /usr/bin/which -s gnome-volume-control > /dev/null 2>&1; then - gnome-volume-control -i - elif [ -x @EXPANDED_BINDIR@/gnome-volume-control ] ; then - @EXPANDED_BINDIR@/gnome-volume-control -i + exec gnome-session + exec @EXPANDED_BINDIR@/gnome-session diff --git a/x11/gdm2/files/patch-config_Default b/x11/gdm2/files/patch-config_Default deleted file mode 100644 index 1c82c6b155c7..000000000000 --- a/x11/gdm2/files/patch-config_Default +++ /dev/null @@ -1,20 +0,0 @@ ---- config/Default.orig Mon Dec 23 23:53:42 2002 -+++ config/Default Mon Dec 23 23:54:11 2002 -@@ -7,7 +7,7 @@ - - sysmodmap=/etc/X11/Xmodmap - --if command -v xmodmap > /dev/null 2>&1; then -+if /usr/bin/which -s xmodmap > /dev/null 2>&1; then - if [ -z "$GDM_PARENT_DISPLAY" ]; then - if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -@@ -17,7 +17,7 @@ - fi - fi - --if command -v setxkbmap > /dev/null 2>&1; then -+if /usr/bin/which -s setxkbmap > /dev/null 2>&1; then - # FIXME: is this all right? Is this completely on crack? - # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY - # FIXME: This should be done in code. Or there must be an easier way ... diff --git a/x11/gdm2/files/patch-config_locale.alias b/x11/gdm2/files/patch-config_locale.alias index a162ae14275f..48d7d1b0004d 100644 --- a/x11/gdm2/files/patch-config_locale.alias +++ b/x11/gdm2/files/patch-config_locale.alias @@ -1,90 +1,91 @@ ---- config/locale.alias.orig Thu Aug 22 18:47:35 2002 -+++ config/locale.alias Wed Sep 18 22:18:10 2002 -@@ -14,54 +14,36 @@ +--- config/locale.alias.orig Wed Jan 8 13:31:44 2003 ++++ config/locale.alias Tue Jan 14 16:51:29 2003 +@@ -14,55 +14,36 @@ # # - George --Azerbaijani az_AZ.utf8,az_AZ --Arabic(Egypt) ar_EG.utf8,ar_EG --Arabic(Lebanon) ar_LB.utf8,ar_LB --Basque eu_ES.utf8,eu_ES --Bulgarian bg_BG.utf8,bg_BG --Catalan ca_ES.utf8,ca_ES --Chinese(simplified) zh_CN.utf8,zh_CN --Chinese(traditional) zh_TW.utf8,zh_TW --Croatian hr_HR.utf8,hr_HR --Czech cs_CZ.utf8,cs_CZ --Danish da_DK.utf8,da_DK --Dutch nl_NL.utf8,nl_NL --Estonian et_EE.utf8,et_EE --English(American) en_US.utf8,en_US --English(Australian) en_AU.utf8,en_AU --English(British) en_GB.utf8,en_GB --English(Ireland) en_IE.utf8,en_IE --Finnish fi_FI.utf8,fi_FI --French fr_FR.utf8,fr_FR --Galician gl_ES.utf8,gl_ES --German de_DE.utf8,de_DE --Greek el_GR.utf8,el_GR --Hebrew he_IL.utf8,he_IL --Hungarian hu_HU.utf8,hu_HU --Icelandic is_IS.utf8,is_IS --Irish ga_IE.utf8,ga_IE --Italian it_IT.utf8,it_IT --Japanese ja_JP.utf8,ja_JP --Korean ko_KR.utf8,ko_KR --Latvian lv_LV.utf8,lv_LV --Lithuanian lt_LT.utf8,lt_LT --Macedonian mk_MK.utf8,mk_MK --Malay ms_MY.utf8,ms_MY --Norwegian(bokmal) no_NO.utf8,no_NO --Norwegian(nynorsk) nn_NO.utf8,nn_NO --Polish pl_PL.utf8,pl_PL --Portuguese pt_PT.utf8,pt_PT --Portuguese(Brazilian) pt_BR.utf8,pt_BR --Romanian ro_RO.utf8,ro_RO --Russian ru_RU.utf8,ru_RU --Slovak sk_SK.utf8,sk_SK --Slovenian sl_SI.utf8,sl_SI --Spanish es_ES.utf8,es_ES --Spanish(Mexico) es_MX.utf8,es_MX --Swedish sv_SE.utf8,sv_SE --Swedish(Finland) sv_FI.utf8,sv_FI --Tamil ta_IN.utf8,ta_IN --Turkish tr_TR.utf8,tr_TR --Ukrainian uk_UA.utf8,uk_UA --Vietnamese vi_VN.utf8,vi_VN --Walloon wa_BE.utf8,wa_BE -+Bulgarian bg_BG.utf8,bg_BG.CP1251 -+Chinese(simplified) zh_CN.utf8,zh_CN.EUC -+Chinese(traditional) zh_TW.utf8,zh_TW.Big5 -+Croatian hr_HR.utf8,hr_HR.ISO_8859-2 -+Czech cs_CZ.utf8,cs_CZ.ISO_8859-2 -+Danish da_DK.utf8,da_DK.ISO_8859-1 -+Dutch nl_NL.utf8,nl_NL.ISO_8859-1 -+Estonian et_EE.utf8,et_EE.ISO_8859-15 -+English(American) en_US.utf8,en_US.ISO_8859-1 -+English(Australian) en_AU.utf8,en_AU.ISO_8859-1 -+English(British) en_GB.utf8,en_GB.ISO_8859-1 -+Finnish fi_FI.utf8,fi_FI.ISO_8859-1 -+French fr_FR.utf8,fr_FR.ISO_8859-1 -+German de_DE.utf8,de_DE.ISO_8859-1 -+Greek el_GR.utf8,el_GR.ISO_8859-7 -+Hungarian hu_HU.utf8,hu_HU.ISO_8859-2 -+Icelandic is_IS.utf8,is_IS.ISO_8859-1 -+Italian it_IT.utf8,it_IT.ISO_8859-1 -+Japanese ja_JP.utf8,ja_JP.EUC -+Korean ko_KR.utf8,ko_KR.EUC -+Lithuanian lt_LT.utf8,lt_LT.ISO_8859-4 -+Norwegian(bokmal) no_NO.utf8,no_NO.ISO_8859-1 -+Polish pl_PL.utf8,pl_PL.ISO_8859-2 -+Portuguese pt_PT.utf8,pt_PT.ISO_8859-1 -+Portuguese(Brazilian) pt_BR.utf8,pt_BR.ISO8859-1 -+Romanian ro_RO.utf8,ro_RO.ISO8859-2 -+Russian ru_RU.utf8,ru_RU.ISO_8859-5 -+Slovak sk_SK.utf8,sk_SK.ISO_8859-2 -+Slovenian sl_SI.utf8,sl_SI.ISO_8859-2 -+Spanish es_ES.utf8,es_ES.ISO_8859-1 -+Swedish sv_SE.utf8,sv_SE.ISO_8859-1 -+Turkish tr_TR.utf8,tr_TR.ISO_8859-9 -+Ukrainian uk_UA.utf8,uk_UA.ISO8859-5 +-Azerbaijani az_AZ.UTF-8,az_AZ +-Arabic(Egypt) ar_EG.UTF-8,ar_EG +-Arabic(Lebanon) ar_LB.UTF-8,ar_LB +-Amharic am_ET.UTF-8,am_ET +-Basque eu_ES.UTF-8,eu_ES +-Bulgarian bg_BG.UTF-8,bg_BG +-Catalan ca_ES.UTF-8,ca_ES +-Chinese(simplified) zh_CN.UTF-8,zh_CN +-Chinese(traditional) zh_TW.UTF-8,zh_TW +-Croatian hr_HR.UTF-8,hr_HR +-Czech cs_CZ.UTF-8,cs_CZ +-Danish da_DK.UTF-8,da_DK +-Dutch nl_NL.UTF-8,nl_NL +-Estonian et_EE.UTF-8,et_EE +-English(American) en_US.UTF-8,en_US +-English(Australian) en_AU.UTF-8,en_AU +-English(British) en_GB.UTF-8,en_GB +-English(Ireland) en_IE.UTF-8,en_IE +-Finnish fi_FI.UTF-8,fi_FI +-French fr_FR.UTF-8,fr_FR +-Galician gl_ES.UTF-8,gl_ES +-German de_DE.UTF-8,de_DE +-Greek el_GR.UTF-8,el_GR +-Hebrew he_IL.UTF-8,he_IL +-Hungarian hu_HU.UTF-8,hu_HU +-Icelandic is_IS.UTF-8,is_IS +-Irish ga_IE.UTF-8,ga_IE +-Italian it_IT.UTF-8,it_IT +-Japanese ja_JP.UTF-8,ja_JP +-Korean ko_KR.UTF-8,ko_KR +-Latvian lv_LV.UTF-8,lv_LV +-Lithuanian lt_LT.UTF-8,lt_LT +-Macedonian mk_MK.UTF-8,mk_MK +-Malay ms_MY.UTF-8,ms_MY +-Norwegian(bokmal) no_NO.UTF-8,no_NO +-Norwegian(nynorsk) nn_NO.UTF-8,nn_NO +-Polish pl_PL.UTF-8,pl_PL +-Portuguese pt_PT.UTF-8,pt_PT +-Portuguese(Brazilian) pt_BR.UTF-8,pt_BR +-Romanian ro_RO.UTF-8,ro_RO +-Russian ru_RU.UTF-8,ru_RU +-Slovak sk_SK.UTF-8,sk_SK +-Slovenian sl_SI.UTF-8,sl_SI +-Spanish es_ES.UTF-8,es_ES +-Spanish(Mexico) es_MX.UTF-8,es_MX +-Swedish sv_SE.UTF-8,sv_SE +-Swedish(Finland) sv_FI.UTF-8,sv_FI +-Tamil ta_IN.UTF-8,ta_IN +-Turkish tr_TR.UTF-8,tr_TR +-Ukrainian uk_UA.UTF-8,uk_UA +-Vietnamese vi_VN.UTF-8,vi_VN +-Walloon wa_BE.UTF-8,wa_BE ++Bulgarian bg_BG.UTF-8,bg_BG.CP1251 ++Chinese(simplified) zh_CN.UTF-8,zh_CN.EUC ++Chinese(traditional) zh_TW.UTF-8,zh_TW.Big5 ++Croatian hr_HR.UTF-8,hr_HR.ISO_8859-2 ++Czech cs_CZ.UTF-8,cs_CZ.ISO_8859-2 ++Danish da_DK.UTF-8,da_DK.ISO_8859-1 ++Dutch nl_NL.UTF-8,nl_NL.ISO_8859-1 ++Estonian et_EE.UTF-8,et_EE.ISO_8859-15 ++English(American) en_US.UTF-8,en_US.ISO_8859-1 ++English(Australian) en_AU.UTF-8,en_AU.ISO_8859-1 ++English(British) en_GB.UTF-8,en_GB.ISO_8859-1 ++Finnish fi_FI.UTF-8,fi_FI.ISO_8859-1 ++French fr_FR.UTF-8,fr_FR.ISO_8859-1 ++German de_DE.UTF-8,de_DE.ISO_8859-1 ++Greek el_GR.UTF-8,el_GR.ISO_8859-7 ++Hungarian hu_HU.UTF-8,hu_HU.ISO_8859-2 ++Icelandic is_IS.UTF-8,is_IS.ISO_8859-1 ++Italian it_IT.UTF-8,it_IT.ISO_8859-1 ++Japanese ja_JP.UTF-8,ja_JP.EUC ++Korean ko_KR.UTF-8,ko_KR.EUC ++Lithuanian lt_LT.UTF-8,lt_LT.ISO_8859-4 ++Norwegian(bokmal) no_NO.UTF-8,no_NO.ISO_8859-1 ++Polish pl_PL.UTF-8,pl_PL.ISO_8859-2 ++Portuguese pt_PT.UTF-8,pt_PT.ISO_8859-1 ++Portuguese(Brazilian) pt_BR.UTF-8,pt_BR.ISO8859-1 ++Romanian ro_RO.UTF-8,ro_RO.ISO8859-2 ++Russian ru_RU.UTF-8,ru_RU.ISO_8859-5 ++Slovak sk_SK.UTF-8,sk_SK.ISO_8859-2 ++Slovenian sl_SI.UTF-8,sl_SI.ISO_8859-2 ++Spanish es_ES.UTF-8,es_ES.ISO_8859-1 ++Swedish sv_SE.UTF-8,sv_SE.ISO_8859-1 ++Turkish tr_TR.UTF-8,tr_TR.ISO_8859-9 ++Ukrainian uk_UA.UTF-8,uk_UA.ISO8859-5 diff --git a/x11/gdm2/files/patch-daemon_gdm.c b/x11/gdm2/files/patch-daemon_gdm.c new file mode 100644 index 000000000000..76c115f8b982 --- /dev/null +++ b/x11/gdm2/files/patch-daemon_gdm.c @@ -0,0 +1,11 @@ +--- daemon/gdm.c.orig Thu May 30 11:02:29 2002 ++++ daemon/gdm.c Thu May 30 10:59:19 2002 +@@ -36,7 +36,7 @@ + #include <locale.h> + + /* This should be moved to auth.c I suppose */ +-#include <X11/Xauth.h> ++/*#include <X11/Xauth.h>*/ + + #include <vicious.h> + diff --git a/x11/gdm2/pkg-install b/x11/gdm2/pkg-install index 237a1ceaa0ca..e373a44e33ca 100644 --- a/x11/gdm2/pkg-install +++ b/x11/gdm2/pkg-install @@ -36,8 +36,8 @@ if [ "$2" = "POST-INSTALL" ]; then exit 1 fi fi - ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm - ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm + ${CHOWN} -R ${USER}:${GROUP} ${PKG_PREFIX}/share/gnome/gdm ${PKG_PREFIX}/etc/gdm + ${CHMOD} 0750 ${PKG_PREFIX}/share/gnome/gdm exit 0 fi diff --git a/x11/gdm2/pkg-plist b/x11/gdm2/pkg-plist index 8f165bb2d6b8..269c2f7e39ca 100644 --- a/x11/gdm2/pkg-plist +++ b/x11/gdm2/pkg-plist @@ -61,6 +61,7 @@ share/gnome/pixmaps/gdm.png share/gnome/pixmaps/login-photo.png share/gnome/pixmaps/nobody.png share/gnome/pixmaps/nohost.png +share/locale/am/LC_MESSAGES/gdm-2.4.mo share/locale/ar/LC_MESSAGES/gdm-2.4.mo share/locale/az/LC_MESSAGES/gdm-2.4.mo share/locale/be/LC_MESSAGES/gdm-2.4.mo @@ -77,12 +78,15 @@ share/locale/fi/LC_MESSAGES/gdm-2.4.mo share/locale/fr/LC_MESSAGES/gdm-2.4.mo share/locale/ga/LC_MESSAGES/gdm-2.4.mo share/locale/gl/LC_MESSAGES/gdm-2.4.mo +share/locale/he/LC_MESSAGES/gdm-2.4.mo share/locale/hu/LC_MESSAGES/gdm-2.4.mo share/locale/it/LC_MESSAGES/gdm-2.4.mo share/locale/ja/LC_MESSAGES/gdm-2.4.mo share/locale/ko/LC_MESSAGES/gdm-2.4.mo share/locale/lt/LC_MESSAGES/gdm-2.4.mo share/locale/lv/LC_MESSAGES/gdm-2.4.mo +share/locale/mk/LC_MESSAGES/gdm-2.4.mo +share/locale/mn/LC_MESSAGES/gdm-2.4.mo share/locale/ms/LC_MESSAGES/gdm-2.4.mo share/locale/nl/LC_MESSAGES/gdm-2.4.mo share/locale/nn/LC_MESSAGES/gdm-2.4.mo @@ -104,5 +108,4 @@ share/locale/zh_TW/LC_MESSAGES/gdm-2.4.mo @dirrm share/gnome/gdm/themes/happygnome @dirrm share/gnome/gdm/themes/circles @dirrm share/gnome/gdm/themes -@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true @dirrm etc/pam.d diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 1c5db99a1fd5..b0eeba4d3e62 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.0 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOMENG= yes -USE_GNOME= gnomeprefix gnomehack +USE_GNOME= gnomehier gnomeprefix gnomehack USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 3f22cfe63b90..265e0d7b2cb5 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3 +MD5 (gnome2/gnome-applets-2.2.0.tar.bz2) = 2c5650d11253fd5c4716c96f688729f7 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index e7abc6211310..fc72f4f9ee6b 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,14 +1,14 @@ ---- configure.orig Mon Nov 18 18:04:37 2002 -+++ configure Wed Nov 20 02:25:38 2002 -@@ -5683,6 +5683,7 @@ +--- configure.orig Mon Dec 16 17:15:36 2002 ++++ configure Thu Dec 19 13:43:27 2002 +@@ -7862,6 +7862,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS ++c_aux_dir/ltconfig $LIBTOOL_DEPS # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8771,6 +8772,7 @@ +@@ -12328,6 +12329,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,41 +16,41 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -8831,6 +8833,20 @@ - HAVE_LIBAPM_TRUE='#' - HAVE_LIBAPM_FALSE= +@@ -12391,6 +12393,20 @@ fi -+ ;; + + ;; + i386-*-freebsd*) -+ HAVE_LIBAPM=no -+ ++ HAVE_LIBAPM=no +if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' ++ HAVE_LIBAPM_TRUE= ++ HAVE_LIBAPM_FALSE='#' +else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= ++ HAVE_LIBAPM_TRUE='#' ++ HAVE_LIBAPM_FALSE= +fi -+ ;; ++ ;; + *-*-freebsd*) -+ build_battstat_applet=no - - ;; ++ build_battstat_applet=no ++ ++ ;; *-*-linux*) -@@ -9420,14 +9436,14 @@ + echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 + echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 +@@ -13688,14 +13704,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define GNOME_ICONDIR "${prefix}/share/pixmaps" +#define GNOME_ICONDIR "${datadir}/pixmaps" - EOF + _ACEOF - #defined the below to enable help to work for applets + #defined the below to enable help to work for applets - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define DATADIR "${prefix}/share" +#define DATADIR "${datadir}" - EOF + _ACEOF - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF diff --git a/x11/gnome-applets/files/patch-battstat_Makefile.in b/x11/gnome-applets/files/patch-battstat_Makefile.in index d0834c4e4faa..f47e6bab6dae 100644 --- a/x11/gnome-applets/files/patch-battstat_Makefile.in +++ b/x11/gnome-applets/files/patch-battstat_Makefile.in @@ -1,26 +1,27 @@ ---- battstat/Makefile.in.orig Wed Nov 20 02:26:09 2002 -+++ battstat/Makefile.in Wed Nov 20 02:28:24 2002 -@@ -144,11 +144,11 @@ +--- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 ++++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 +@@ -148,11 +148,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = -lapm --@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a + @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm +-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a +@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = apmlib +-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib +@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ +-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ +@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -194,7 +194,7 @@ - battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) - @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = --@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = +@@ -223,8 +223,7 @@ + @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ + @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la + @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ +-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \ +-@HAVE_LIBAPM_FALSE@apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la battstat_applet_2_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index b0cfa6f65db6..759100e439d0 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 libexec/gkb-applet-2 +libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade +share/gnome/gen_util/mini-commander.glade share/gnome/geyes/Bizarre/Bizarre-eye.png share/gnome/geyes/Bizarre/Bizarre-pupil.png share/gnome/geyes/Bizarre/config @@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png share/gnome/geyes/Horrid/horrid_pupil.png share/gnome/gkb/AM_Armenian.keyprop share/gnome/gkb/AR_Arabic.keyprop +share/gnome/gkb/AR_Arabic_x.keyprop share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop share/gnome/gkb/Armenian.keyprop share/gnome/gkb/BE_Dutch.keyprop @@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop share/gnome/gkb/EE_Estonian.keyprop share/gnome/gkb/EE_Estonian_x.keyprop share/gnome/gkb/ES_Spanish.keyprop +share/gnome/gkb/ES_Spanish-x86.keyprop share/gnome/gkb/ES_Spanish_x.keyprop share/gnome/gkb/FI_Finnish.keyprop share/gnome/gkb/FI_Finnish_x.keyprop share/gnome/gkb/FR_French.keyprop +share/gnome/gkb/FR_French-x86.keyprop share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop @@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop share/gnome/gkb/GeorgianRussian.keyprop share/gnome/gkb/German.keyprop share/gnome/gkb/GermanSwiss.keyprop +share/gnome/gkb/HR_Croatian.keyprop share/gnome/gkb/HU_Hungarian.keyprop share/gnome/gkb/Hungarian-101.keyprop share/gnome/gkb/Hungarian-lat1.keyprop share/gnome/gkb/Hungarian-sun.keyprop +share/gnome/gkb/Hungarian-x86.keyprop share/gnome/gkb/Hungarian.keyprop share/gnome/gkb/Hungarian101-1.keyprop share/gnome/gkb/Hungarian101.keyprop @@ -134,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop share/gnome/gkb/IT_Italian_x.keyprop share/gnome/gkb/JP_Japanese.keyprop share/gnome/gkb/JP_Japanese_x.keyprop +share/gnome/gkb/KR_Korean.keyprop share/gnome/gkb/LA_Lao_x.keyprop share/gnome/gkb/LT_Lithuanian.keyprop share/gnome/gkb/LT_Lithuanian_x.keyprop @@ -171,7 +181,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-84.keyprop share/gnome/gkb/US-dec.keyprop @@ -184,8 +196,9 @@ share/gnome/gkb/US.keyprop share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop -share/gnome/gkb/YU_Serbo-Croatian_x.keyprop +share/gnome/gkb/YU_Serb_x.keyprop share/gnome/gkb/Yugoslav.keyprop +share/gnome/gkb/presets.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml @@ -198,6 +211,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png @@ -223,6 +237,12 @@ share/gnome/help/char-palette/C/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/legal.xml +share/gnome/help/drivemount/C/drivemount.xml +share/gnome/help/drivemount/C/figures/drivemount_applet_all.png +share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml @@ -242,14 +262,25 @@ share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml share/gnome/help/mixer_applet2/C/topic.dat %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf +@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -293,7 +324,9 @@ share/gnome/pixmaps/gkb/it.png share/gnome/pixmaps/gkb/jo.png share/gnome/pixmaps/gkb/jp.png share/gnome/pixmaps/gkb/km.png +share/gnome/pixmaps/gkb/kr.png share/gnome/pixmaps/gkb/kw.png +share/gnome/pixmaps/gkb/lam.png share/gnome/pixmaps/gkb/la.png share/gnome/pixmaps/gkb/lb.png share/gnome/pixmaps/gkb/lt.png @@ -316,6 +349,7 @@ share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png +share/gnome/pixmaps/gkb/sr.png share/gnome/pixmaps/gkb/su.png share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png @@ -343,7 +377,16 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/wireless-applet/broken-0.png +share/gnome/pixmaps/wireless-applet/no-link-0.png +share/gnome/pixmaps/wireless-applet/signal-1-40.png +share/gnome/pixmaps/wireless-applet/signal-41-60.png +share/gnome/pixmaps/wireless-applet/signal-61-80.png +share/gnome/pixmaps/wireless-applet/signal-81-100.png +share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am +share/gnome/xmodmap/xmodmap.ar share/gnome/xmodmap/xmodmap.be share/gnome/xmodmap/xmodmap.bg share/gnome/xmodmap/xmodmap.br @@ -357,9 +400,11 @@ share/gnome/xmodmap/xmodmap.dk share/gnome/xmodmap/xmodmap.dvorak share/gnome/xmodmap/xmodmap.ee share/gnome/xmodmap/xmodmap.es +share/gnome/xmodmap/xmodmap.es_x86 share/gnome/xmodmap/xmodmap.fi share/gnome/xmodmap/xmodmap.fr share/gnome/xmodmap/xmodmap.fr-2 +share/gnome/xmodmap/xmodmap.fr_x86 share/gnome/xmodmap/xmodmap.gb share/gnome/xmodmap/xmodmap.gb-102 share/gnome/xmodmap/xmodmap.gb-105 @@ -374,11 +419,13 @@ share/gnome/xmodmap/xmodmap.hu-lat1 share/gnome/xmodmap/xmodmap.hu-sun-lat2 share/gnome/xmodmap/xmodmap.hu.old share/gnome/xmodmap/xmodmap.hu_latin1 +share/gnome/xmodmap/xmodmap.hu_x86 share/gnome/xmodmap/xmodmap.il share/gnome/xmodmap/xmodmap.il_phonetic share/gnome/xmodmap/xmodmap.is share/gnome/xmodmap/xmodmap.it share/gnome/xmodmap/xmodmap.jp +share/gnome/xmodmap/xmodmap.kr share/gnome/xmodmap/xmodmap.la share/gnome/xmodmap/xmodmap.lt share/gnome/xmodmap/xmodmap.lt_b @@ -405,7 +452,9 @@ share/gnome/xmodmap/xmodmap.th share/gnome/xmodmap/xmodmap.tr_f share/gnome/xmodmap/xmodmap.tr_q share/gnome/xmodmap/xmodmap.uk +share/gnome/xmodmap/xmodmap.uk_x86 share/gnome/xmodmap/xmodmap.us +share/gnome/xmodmap/xmodmap.us101A_x86 share/gnome/xmodmap/xmodmap.us-101 share/gnome/xmodmap/xmodmap.us-84 share/gnome/xmodmap/xmodmap.us-dec @@ -435,12 +484,15 @@ share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo @@ -461,6 +513,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/xmodmap +@dirrm share/gnome/wireless-applet @dirrm share/gnome/pixmaps/mixer @dirrm share/gnome/pixmaps/mini-commander @dirrm share/gnome/pixmaps/gweather @@ -475,12 +528,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gkb/C/figures -@dirrm share/gnome/help/gkb/C -@dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes +@dirrm share/gnome/help/drivemount/C/figures +@dirrm share/gnome/help/drivemount/C +@dirrm share/gnome/help/drivemount @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line @@ -490,18 +543,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/cdplayer/C/figures @dirrm share/gnome/help/cdplayer/C @dirrm share/gnome/help/cdplayer -%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/C -%%BATTERY%%@dirrm share/gnome/help/battstat @dirrm share/gnome/gweather @dirrm share/gnome/gkb -@dirrm share/gnome/geyes/Horrid -@dirrm share/gnome/geyes/Default-tiny -@dirrm share/gnome/geyes/Default -@dirrm share/gnome/geyes/Bloodshot -@dirrm share/gnome/geyes/Bizarre -@dirrm share/gnome/geyes +@dirrm share/gnome/gen_util %%BATTERY%%@dirrm share/gnome/battstat_applet +@dirrm libexec/gnome-applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @@ -524,3 +570,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet +@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 323915fab1ef..8f1c292a4c49 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.0.10 +PORTVERSION= 2.2.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.0 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 49d280e227f2..3ebb8fa8c311 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.0.10.tar.bz2) = 5a04d472ce8c6be6a823d348362a6d0b +MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index cbd05d5d550e..c1eb5c92f788 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -1,11 +1,10 @@ bin/gnome-about include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h -include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.0 +lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/gnome-about/contributors.dat share/gnome/gnome-about/gnome-version.xml @@ -18,15 +17,13 @@ share/gnome/vfolders/Applications.directory share/gnome/vfolders/Development.directory share/gnome/vfolders/Games.directory share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Home.directory share/gnome/vfolders/Internet.directory share/gnome/vfolders/Multimedia.directory share/gnome/vfolders/Office.directory share/gnome/vfolders/Root.directory -share/gnome/vfolders/Root.order share/gnome/vfolders/Settings.directory -share/gnome/vfolders/Settings.order share/gnome/vfolders/System.directory +share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/cdeappmenu.png @@ -155,7 +152,6 @@ share/gnome/pixmaps/panel-folder.png share/gnome/pixmaps/panel-knob.png share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm -share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,6 +179,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo @@ -195,9 +192,11 @@ share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index a28b5926035f..db2138760fbb 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,21 +6,21 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.0.11 +PORTVERSION= 2.2.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.0 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \ - gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop +LIB_DEPENDS= wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \ + gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_SHLIB= yes +USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 66c1e6cb333f..e6e3514326ed 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.0.11.tar.bz2) = 27345e392e336df85ca4fe44af90a3f4 +MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8 diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in index cb37ef76389a..8a59166a57b7 100644 --- a/x11/gnome-panel/files/patch-config.h.in +++ b/x11/gnome-panel/files/patch-config.h.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- config.h.in 2002/05/14 14:15:00 1.1 -+++ config.h.in 2002/05/14 14:15:35 -@@ -148,6 +148,8 @@ - /* Define if you have the `strdup' function. */ - #undef HAVE_STRDUP +--- config.h.in.orig Thu Jan 2 19:50:41 2003 ++++ config.h.in Mon Jan 6 13:11:12 2003 +@@ -96,6 +96,8 @@ + /* Define to 1 if you have the <stdlib.h> header file. */ + #undef HAVE_STDLIB_H +#undef HAVE_LANGINFO_H + - /* Define if you have the <strings.h> header file. */ + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure index 89007e07bc69..a94d4761c395 100644 --- a/x11/gnome-panel/files/patch-configure +++ b/x11/gnome-panel/files/patch-configure @@ -1,22 +1,19 @@ - -$FreeBSD$ - ---- configure.orig Tue May 14 17:16:32 2002 -+++ configure Tue May 14 17:17:03 2002 -@@ -7232,6 +7232,7 @@ +--- configure.orig Mon Jan 6 01:04:20 2003 ++++ configure Mon Jan 6 13:12:56 2003 +@@ -4254,7 +4254,7 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9288,7 +9289,7 @@ - # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h langinfo.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:9294: checking for $ac_header" >&5 + echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -7878,6 +7878,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11/gnome-panel/files/patch-temp b/x11/gnome-panel/files/patch-temp deleted file mode 100644 index a863cbbc8bd9..000000000000 --- a/x11/gnome-panel/files/patch-temp +++ /dev/null @@ -1,441 +0,0 @@ -This patch reverts fully rev.1.50 of xstuff.c and rev.1.22 of xstuff.h, as -well as partially rev.1.302 of session.c and rev.1.176 of basep-widget.c. -The goal is to make Nautilus recognizing presence of the panel on screen, -so that it doesn't put its icons under the panel(s). For some reason, -advertized in ChangeLog _NET_WM_WORKAREA isn't recognised by Nautilus-2.0.0 -available at this time. - ---- gnome-panel/xstuff.c.orig Sun Aug 4 18:30:21 2002 -+++ gnome-panel/xstuff.c Thu Aug 8 22:19:15 2002 -@@ -8,46 +8,97 @@ - * Mark McLoughlin <mark@skynet.ie> - */ - #include <config.h> --#include <string.h> -- --#include <gdk/gdk.h> - #include <gdk/gdkx.h> -+#include <string.h> - -+#include <X11/Xmd.h> - #include <X11/Xlib.h> - #include <X11/Xatom.h> - --#include "xstuff.h" -+/* Yes, yes I know, now bugger off ... */ -+#define WNCK_I_KNOW_THIS_IS_UNSTABLE -+#include <libwnck/libwnck.h> - -+#include "xstuff.h" -+#include "multiscreen-stuff.h" -+#include "basep-widget.h" -+#include "foobar-widget.h" - #include "global-keys.h" - --static Atom --panel_atom_get (Display *display, -- const char *atom_name) -+/*list of all panel widgets created*/ -+extern GSList *panel_list; -+ -+static void xstuff_setup_global_desktop_area (int left, int right, -+ int top, int bottom); -+ -+#define ATOM(name) xstuff_atom_intern(GDK_DISPLAY(),name) -+/* Once we have multiple display support we need to only use -+ * the below ones */ -+ -+#define ATOMD(display,name) xstuff_atom_intern(display,name) -+#define ATOMEV(event,name) xstuff_atom_intern(((XAnyEvent *)event)->display,name) -+#define ATOMGDK(win,name) xstuff_atom_intern(GDK_WINDOW_XDISPLAY(win),name) -+ -+Atom -+xstuff_atom_intern (Display *display, const char *name) - { -- static GHashTable *atom_hash; -- Atom retval; -+ static GHashTable *cache = NULL; -+ char *key; -+ Atom atom; - - g_return_val_if_fail (display != NULL, None); -- g_return_val_if_fail (atom_name != NULL, None); -+ g_return_val_if_fail (name != NULL, None); -+ -+ if (cache == 0) -+ cache = g_hash_table_new (g_str_hash, g_str_equal); - -- if (!atom_hash) -- atom_hash = g_hash_table_new_full ( -- g_str_hash, g_str_equal, g_free, NULL); -- -- retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name)); -- if (!retval) { -- retval = XInternAtom (display, atom_name, FALSE); -- -- if (retval != None) -- g_hash_table_insert (atom_hash, g_strdup (atom_name), -- GUINT_TO_POINTER (retval)); -+ key = g_strdup_printf ("%p %s", display, name); -+ -+ atom = (Atom)g_hash_table_lookup (cache, key); -+ if (atom == 0) { -+ atom = XInternAtom (display, name, False); -+ g_hash_table_insert (cache, key, (gpointer)atom); -+ } else { -+ g_free (key); - } - -- return retval; -+ return atom; -+} -+ -+void -+xstuff_init (void) -+{ -+ /* setup the keys filter */ -+ gdk_window_add_filter (gdk_get_default_root_window (), -+ panel_global_keys_filter, -+ NULL); -+ -+ gdk_error_trap_push (); -+ -+ xstuff_setup_global_desktop_area (0, 0, 0, 0); -+ -+ gdk_error_trap_pop (); -+} -+ -+void -+xstuff_set_simple_hint (GdkWindow *w, const char *name, long val) -+{ -+ Atom atom = ATOMGDK (w, name); -+ -+ gdk_error_trap_push (); -+ -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_WINDOW_XWINDOW (w), -+ atom, atom, -+ 32, PropModeReplace, -+ (unsigned char*)&val, 1); -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); - } - - /* Stolen from deskguide */ --static gpointer -+gpointer - get_typed_property_data (Display *xdisplay, - Window xwindow, - Atom property, -@@ -156,7 +207,7 @@ - - data = get_typed_property_data (GDK_DISPLAY (), - GDK_ROOT_WINDOW (), -- panel_atom_get (GDK_DISPLAY (), "_NET_SUPPORTED"), -+ ATOM ("_NET_SUPPORTED"), - XA_ATOM, - &size, 32); - if (data != NULL) { -@@ -176,11 +227,9 @@ - - XDeleteProperty (GDK_WINDOW_XDISPLAY (win), - GDK_WINDOW_XWINDOW (win), -- panel_atom_get (GDK_WINDOW_XDISPLAY (win), -- "WM_CLIENT_LEADER")); -+ ATOMGDK (win, "WM_CLIENT_LEADER")); - -- old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win), -- GDK_WINDOW_XWINDOW (win)); -+ old_wmhints = XGetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (win)); - /* General paranoia */ - if (old_wmhints != NULL) { - memcpy (&wmhints, old_wmhints, sizeof (XWMHints)); -@@ -197,16 +246,124 @@ - wmhints.input = False; - wmhints.initial_state = NormalState; - } -- -- XSetWMHints (GDK_WINDOW_XDISPLAY (win), -+ XSetWMHints (GDK_DISPLAY (), - GDK_WINDOW_XWINDOW (win), - &wmhints); - } - -+ -+static void -+xstuff_setup_global_desktop_area (int left, int right, int top, int bottom) -+{ -+ long vals[4]; -+ static int old_left = -1, old_right = -1, old_top = -1, old_bottom = -1;+ -+ left = left >= 0 ? left : old_left; -+ right = right >= 0 ? right : old_right; -+ top = top >= 0 ? top : old_top; -+ bottom = bottom >= 0 ? bottom : old_bottom; -+ -+ if (old_left == left && -+ old_right == right && -+ old_top == top && -+ old_bottom == bottom) -+ return; -+ -+ vals[0] = left; -+ vals[1] = right; -+ vals[2] = top; -+ vals[3] = bottom; -+ -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM ("GNOME_PANEL_DESKTOP_AREA"), -+ XA_CARDINAL, -+ 32, PropModeReplace, -+ (unsigned char *)vals, 4); -+ -+ old_left = left; -+ old_right = right; -+ old_top = top; -+ old_bottom = bottom; -+} -+ -+void -+xstuff_setup_desktop_area (int screen, int left, int right, int top, int bottom) -+{ -+ char *screen_atom; -+ long vals[4]; -+ static int screen_width = -1, screen_height = -1; -+ -+ if (screen_width < 0) -+ screen_width = gdk_screen_width (); -+ if (screen_height < 0) -+ screen_height = gdk_screen_height (); -+ -+ vals[0] = left; -+ vals[1] = right; -+ vals[2] = top; -+ vals[3] = bottom; -+ -+ gdk_error_trap_push (); -+ -+ /* Note, when we do standard multihead and we have per screen -+ * root window, this should just set the GNOME_PANEL_DESKTOP_AREA */ -+ screen_atom = g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", -+ screen); -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM (screen_atom), -+ XA_CARDINAL, -+ 32, PropModeReplace, -+ (unsigned char *)vals, 4); -+ -+ g_free (screen_atom); -+ -+ xstuff_setup_global_desktop_area -+ ((multiscreen_x (screen) == 0) ? left : -1, -+ (multiscreen_x (screen) + -+ multiscreen_width (screen) == screen_width) ? right : -1, -+ (multiscreen_y (screen) == 0) ? top : -1, -+ (multiscreen_y (screen) + -+ multiscreen_height (screen) == screen_height) ? bottom : -1); -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); -+} -+ -+void -+xstuff_unsetup_desktop_area (void) -+{ -+ int i; -+ char *screen_atom; -+ -+ gdk_error_trap_push (); -+ -+ XDeleteProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM ("GNOME_PANEL_DESKTOP_AREA")); -+ -+ for (i = 0; i < multiscreen_screens (); i++) { -+ screen_atom = -+ g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", i); -+ -+ XDeleteProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM (screen_atom)); -+ -+ g_free (screen_atom); -+ } -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); -+} -+ -+ -+ - /* This is such a broken stupid function. */ - void - xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) - { -+ Window win = GDK_WINDOW_XWINDOW (window); - XSizeHints size_hints; - int old_x, old_y, old_w, old_h; - -@@ -231,9 +388,7 @@ - - gdk_error_trap_push (); - -- XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window), -- GDK_WINDOW_XWINDOW (window), -- &size_hints); -+ XSetWMNormalHints (GDK_DISPLAY (), win, &size_hints); - - gdk_window_move_resize (window, x, y, w, h); - -@@ -250,33 +405,29 @@ - xstuff_set_wmspec_dock_hints (GdkWindow *window, - gboolean autohide) - { -- Atom atoms [2] = { None, None }; -+ Atom atoms[2] = { None, None }; - -- if (!autohide) -- atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE_DOCK"); -- else { -- atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL"); -- atoms [1] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE_DOCK"); -+ if (autohide) { -+ atoms[0] = ATOMGDK (window, "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL"); -+ atoms[1] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK"); -+ } else { -+ atoms[0] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK"); - } - - XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), -- panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE"), -+ ATOMGDK (window, "_NET_WM_WINDOW_TYPE"), - XA_ATOM, 32, PropModeReplace, -- (unsigned char *) atoms, -+ (guchar *)atoms, - autohide ? 2 : 1); - } - - void - xstuff_set_wmspec_strut (GdkWindow *window, -- int left, -- int right, -- int top, -- int bottom) -+ int left, -+ int right, -+ int top, -+ int bottom) - { - long vals [4]; - -@@ -287,25 +438,15 @@ - - XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), -- panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_STRUT"), -+ ATOMGDK (window, "_NET_WM_STRUT"), - XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) vals, 4); -+ (guchar *)vals, 4); - } - - void - xstuff_delete_property (GdkWindow *window, const char *name) - { -- Display *xdisplay = GDK_WINDOW_XDISPLAY (window); -- Window xwindow = GDK_WINDOW_XWINDOW (window); -- -- XDeleteProperty (xdisplay, xwindow, -- panel_atom_get (xdisplay, name)); --} -- --void --xstuff_init (void) --{ -- gdk_window_add_filter (gdk_get_default_root_window (), -- panel_global_keys_filter, NULL); -+ XDeleteProperty (GDK_WINDOW_XDISPLAY (window), -+ GDK_WINDOW_XWINDOW (window), -+ ATOMGDK (window, name)); - } ---- gnome-panel/xstuff.h.orig Fri Jun 21 02:07:59 2002 -+++ gnome-panel/xstuff.h Thu Aug 8 22:11:31 2002 -@@ -1,15 +1,36 @@ --#ifndef __XSTUFF_H__ --#define __XSTUFF_H__ -+#ifndef XSTUFF_H - --#include <gdk/gdk.h> -+#include <gdk/gdkx.h> -+ -+#include <X11/Xmd.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> - - void xstuff_init (void); -+Atom xstuff_atom_intern (Display *display, -+ const char *name); -+void xstuff_set_simple_hint (GdkWindow *w, -+ const char *name, -+ long val); - void xstuff_delete_property (GdkWindow *window, - const char *name); - gboolean xstuff_is_compliant_wm (void); - -+gpointer get_typed_property_data (Display *xdisplay, -+ Window xwindow, -+ Atom property, -+ Atom requested_type, -+ gint *size_p, -+ guint expected_format); -+ - void xstuff_set_no_group_and_no_input (GdkWindow *win); - -+void xstuff_setup_desktop_area (int screen, -+ int left, -+ int right, -+ int top, -+ int bottom); -+ - void xstuff_unsetup_desktop_area (void); - void xstuff_set_pos_size (GdkWindow *window, - int x, int y, -@@ -22,4 +43,4 @@ - int top, - int bottom); - --#endif /* __XSTUFF_H__ */ -+#endif ---- gnome-panel/basep-widget.c.orig Sun Aug 4 18:29:17 2002 -+++ gnome-panel/basep-widget.c Thu Aug 8 22:11:37 2002 -@@ -2508,6 +2508,11 @@ - BASEP_WIDGET (panel)->screen == screen) - gtk_widget_queue_resize (panel); - } -+ xstuff_setup_desktop_area (screen, -+ sb->left, -+ sb->right, -+ sb->top, -+ sb->bottom); - } - - static guint queue_recalc_id = 0; ---- gnome-panel/session.c.orig Wed Jul 31 20:02:15 2002 -+++ gnome-panel/session.c Thu Aug 8 22:11:41 2002 -@@ -242,6 +242,8 @@ - - gnome_config_sync (); - -+ xstuff_unsetup_desktop_area (); -+ - panel_shell_unregister (); - - gtk_main_quit(); diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 62253efbfd8e..a8c6fcc9d5dc 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -3,12 +3,14 @@ bin/gnome-panel bin/gnome-panel-preferences bin/gnome-panel-screenshot bin/panel-test-applets +etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml @@ -26,6 +28,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml @@ -42,6 +45,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas +etc/gconf/schemas/gnome-panel-screenshot.schemas etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/pager.schemas etc/gconf/schemas/panel-global-config.schemas @@ -57,17 +61,21 @@ lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server +libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 +libexec/notification-area-applet share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gen_util/pager.glade share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml +share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml +share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml share/gnome/gnome-panelrc share/doc/panel-applet/applet-popups.html @@ -81,35 +89,40 @@ share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html +share/gnome/fish/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png share/gnome/help/clock/C/legal.xml share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/figures/fish_settings.png share/gnome/help/fish-applet-2/C/fish-applet-2.xml share/gnome/help/fish-applet-2/C/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck-applet.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png share/gnome/help/mailcheck/C/figures/mailcheck_applet.png share/gnome/help/mailcheck/C/legal.xml share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/notification-area/C/figures/notification-area.png +share/gnome/help/notification-area/C/legal.xml +share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png -share/gnome/help/window-list/C/figures/window_list_group.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml share/gnome/help/window-list/C/window-list.xml -share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/C/legal.xml share/gnome/help/workspace-switcher/C/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl share/gnome/omf/gnome-panel/clock-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-panel/notification-area-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade share/gnome/pixmaps/fish/fishanim.png @@ -123,6 +136,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png share/gnome/pixmaps/mailcheck/email-tiny.png share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/gnome-show-desktop.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -141,6 +155,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo @@ -148,6 +163,7 @@ share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -160,6 +176,7 @@ share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo @@ -189,6 +206,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/gen_util @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel +@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs @@ -205,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002 @@ -222,9 +241,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global @dirrm etc/gconf/gconf.xml.defaults/apps/panel +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 25f637facffc..b18a2db68a72 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.0.9 +PORTVERSION= 2.2.0.2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-session/2.0 +MASTER_SITE_SUBDIR= sources/gnome-session/2.2 DISTNAME= gnome-session-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes @@ -28,8 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 save-session.1 \ - session-properties.1 +MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 post-patch: diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index d62947fd6993..7a3e911c6bc1 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-session-2.0.9.tar.bz2) = 55659ab1dbcc521ded652aadc309287d +MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3 diff --git a/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in new file mode 100644 index 000000000000..9bd6c9a2cf68 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_gnome-session.schemas.in.in @@ -0,0 +1,11 @@ +--- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002 ++++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002 +@@ -50,7 +50,7 @@ + <applyto>/apps/gnome-session/options/splash_image</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default> ++ <default>@datadir@/pixmaps/splash/gnome-splash.png</default> + <locale name="C"> + <short>Splash Screen Image</short> + <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long> diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index a7aa07265800..6f959c8d2217 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -40,6 +40,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo @@ -52,6 +53,7 @@ share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 1ebe61ff7ee5..b555f0146410 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,17 +6,22 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.0.2 +PORTVERSION= 2.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.0 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \ - gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui + +.if defined(WITH_ZVT) +LIB_DEPENDS+= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt +.else +LIB_DEPENDS+= vte.4:${PORTSDIR}/x11-toolkits/vte +.endif USE_BZIP2= yes USE_X_PREFIX= yes @@ -29,8 +34,16 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +.if defined(WITH_ZVT) +CONFIGURE_ARGS= --with-widget=zvt +.else +CONFIGURE_ARGS= --with-widget=vte +.endif + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in .include <bsd.port.mk> diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index 47aefe60135d..bb26f7157df0 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.0.2.tar.bz2) = 3a4a7e523e05296ede8d2a23029a8d50 +MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 0c42fb08539a..52c9e6d8ab6b 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -18,9 +18,18 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/C/figures/terminal_window.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml +share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/ro/figures/terminal_window.png +share/gnome/help/gnome-terminal/ro/gnome-terminal.xml +share/gnome/help/gnome-terminal/ro/legal.xml share/gnome/omf/gnome-terminal/gnome-terminal-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-terminal.png share/locale/am/LC_MESSAGES/gnome-terminal.mo +share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo @@ -34,12 +43,17 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo +share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo +share/locale/mk/LC_MESSAGES/gnome-terminal.mo +share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo +share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo @@ -48,15 +62,16 @@ share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo +share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal +@dirrm share/gnome/help/gnome-terminal/ro/figures +@dirrm share/gnome/help/gnome-terminal/ro @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings @@ -67,3 +82,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 1c5db99a1fd5..b0eeba4d3e62 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.0 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.2 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,7 +24,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes USE_GNOMENG= yes -USE_GNOME= gnomeprefix gnomehack +USE_GNOME= gnomehier gnomeprefix gnomehack USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index 3f22cfe63b90..265e0d7b2cb5 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-applets-2.0.4.tar.bz2) = a31f48077622bb28c6672b46abbcd7a3 +MD5 (gnome2/gnome-applets-2.2.0.tar.bz2) = 2c5650d11253fd5c4716c96f688729f7 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index e7abc6211310..fc72f4f9ee6b 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,14 +1,14 @@ ---- configure.orig Mon Nov 18 18:04:37 2002 -+++ configure Wed Nov 20 02:25:38 2002 -@@ -5683,6 +5683,7 @@ +--- configure.orig Mon Dec 16 17:15:36 2002 ++++ configure Thu Dec 19 13:43:27 2002 +@@ -7862,6 +7862,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS ++c_aux_dir/ltconfig $LIBTOOL_DEPS # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -8771,6 +8772,7 @@ +@@ -12328,6 +12329,7 @@ *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";; *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";; *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";; @@ -16,41 +16,41 @@ *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; esac case "$host" in -@@ -8831,6 +8833,20 @@ - HAVE_LIBAPM_TRUE='#' - HAVE_LIBAPM_FALSE= +@@ -12391,6 +12393,20 @@ fi -+ ;; + + ;; + i386-*-freebsd*) -+ HAVE_LIBAPM=no -+ ++ HAVE_LIBAPM=no +if test "x$HAVE_LIBAPM" = "xyes"; then -+ HAVE_LIBAPM_TRUE= -+ HAVE_LIBAPM_FALSE='#' ++ HAVE_LIBAPM_TRUE= ++ HAVE_LIBAPM_FALSE='#' +else -+ HAVE_LIBAPM_TRUE='#' -+ HAVE_LIBAPM_FALSE= ++ HAVE_LIBAPM_TRUE='#' ++ HAVE_LIBAPM_FALSE= +fi -+ ;; ++ ;; + *-*-freebsd*) -+ build_battstat_applet=no - - ;; ++ build_battstat_applet=no ++ ++ ;; *-*-linux*) -@@ -9420,14 +9436,14 @@ + echo "$as_me:$LINENO: checking for apm_read in -lapm" >&5 + echo $ECHO_N "checking for apm_read in -lapm... $ECHO_C" >&6 +@@ -13688,14 +13704,14 @@ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define GNOME_ICONDIR "${prefix}/share/pixmaps" +#define GNOME_ICONDIR "${datadir}/pixmaps" - EOF + _ACEOF - #defined the below to enable help to work for applets + #defined the below to enable help to work for applets - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF -#define DATADIR "${prefix}/share" +#define DATADIR "${datadir}" - EOF + _ACEOF - cat >> confdefs.h <<EOF + cat >>confdefs.h <<_ACEOF diff --git a/x11/gnomeapplets2/files/patch-battstat_Makefile.in b/x11/gnomeapplets2/files/patch-battstat_Makefile.in index d0834c4e4faa..f47e6bab6dae 100644 --- a/x11/gnomeapplets2/files/patch-battstat_Makefile.in +++ b/x11/gnomeapplets2/files/patch-battstat_Makefile.in @@ -1,26 +1,27 @@ ---- battstat/Makefile.in.orig Wed Nov 20 02:26:09 2002 -+++ battstat/Makefile.in Wed Nov 20 02:28:24 2002 -@@ -144,11 +144,11 @@ +--- battstat/Makefile.in.orig Thu Dec 19 13:50:27 2002 ++++ battstat/Makefile.in Thu Dec 19 13:51:02 2002 +@@ -148,11 +148,11 @@ pixmapsdir = $(datadir)/pixmaps pixmaps_DATA = battstat.png - @HAVE_LIBAPM_TRUE@APMLIB = -lapm --@HAVE_LIBAPM_FALSE@APMLIB = apmlib/libapm.a + @HAVE_LIBAPM_TRUE@APMLIB = @HAVE_LIBAPM_TRUE@-lapm +-@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_FALSE@apmlib/libapm.a +@HAVE_LIBAPM_FALSE@APMLIB = @HAVE_LIBAPM_TRUE@APMDIR = --@HAVE_LIBAPM_FALSE@APMDIR = apmlib +-@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_FALSE@apmlib +@HAVE_LIBAPM_FALSE@APMDIR = @HAVE_LIBAPM_TRUE@APMINC = --@HAVE_LIBAPM_FALSE@APMINC = -Iapmlib/ +-@HAVE_LIBAPM_FALSE@APMINC = @HAVE_LIBAPM_FALSE@-Iapmlib/ +@HAVE_LIBAPM_FALSE@APMINC = SUBDIRS = docs sounds $(APMDIR) -@@ -194,7 +194,7 @@ - battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) - @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = --@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = apmlib/libapm.a -+@HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = +@@ -223,8 +223,7 @@ + @HAVE_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ + @HAVE_LIBAPM_TRUE@$(top_builddir)/screen-exec/libscreen-exec.la + @HAVE_LIBAPM_FALSE@battstat_applet_2_DEPENDENCIES = \ +-@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la \ +-@HAVE_LIBAPM_FALSE@apmlib/libapm.a ++@HAVE_LIBAPM_FALSE@$(top_builddir)/screen-exec/libscreen-exec.la battstat_applet_2_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index b0cfa6f65db6..759100e439d0 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -45,19 +45,23 @@ libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server libdata/bonobo/servers/GNOME_ModemLightsApplet.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server %%BATTERY%%libexec/battstat-applet-2 libexec/cdplayer_applet2 libexec/charpick_applet2 libexec/drivemount_applet2 libexec/geyes_applet2 libexec/gkb-applet-2 +libexec/gnome-applets/mc-install-default-macros libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet libexec/mixer_applet2 libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/wireless-applet %%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade +share/gnome/gen_util/mini-commander.glade share/gnome/geyes/Bizarre/Bizarre-eye.png share/gnome/geyes/Bizarre/Bizarre-pupil.png share/gnome/geyes/Bizarre/config @@ -75,6 +79,7 @@ share/gnome/geyes/Horrid/horrid_eye.png share/gnome/geyes/Horrid/horrid_pupil.png share/gnome/gkb/AM_Armenian.keyprop share/gnome/gkb/AR_Arabic.keyprop +share/gnome/gkb/AR_Arabic_x.keyprop share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop share/gnome/gkb/Armenian.keyprop share/gnome/gkb/BE_Dutch.keyprop @@ -100,10 +105,12 @@ share/gnome/gkb/Dvorak.keyprop share/gnome/gkb/EE_Estonian.keyprop share/gnome/gkb/EE_Estonian_x.keyprop share/gnome/gkb/ES_Spanish.keyprop +share/gnome/gkb/ES_Spanish-x86.keyprop share/gnome/gkb/ES_Spanish_x.keyprop share/gnome/gkb/FI_Finnish.keyprop share/gnome/gkb/FI_Finnish_x.keyprop share/gnome/gkb/FR_French.keyprop +share/gnome/gkb/FR_French-x86.keyprop share/gnome/gkb/FR_French_x.keyprop share/gnome/gkb/FrenchCanadian.keyprop share/gnome/gkb/FrenchCanadian2.keyprop @@ -119,10 +126,12 @@ share/gnome/gkb/GeorgianLatin.keyprop share/gnome/gkb/GeorgianRussian.keyprop share/gnome/gkb/German.keyprop share/gnome/gkb/GermanSwiss.keyprop +share/gnome/gkb/HR_Croatian.keyprop share/gnome/gkb/HU_Hungarian.keyprop share/gnome/gkb/Hungarian-101.keyprop share/gnome/gkb/Hungarian-lat1.keyprop share/gnome/gkb/Hungarian-sun.keyprop +share/gnome/gkb/Hungarian-x86.keyprop share/gnome/gkb/Hungarian.keyprop share/gnome/gkb/Hungarian101-1.keyprop share/gnome/gkb/Hungarian101.keyprop @@ -134,6 +143,7 @@ share/gnome/gkb/IT_Italian.keyprop share/gnome/gkb/IT_Italian_x.keyprop share/gnome/gkb/JP_Japanese.keyprop share/gnome/gkb/JP_Japanese_x.keyprop +share/gnome/gkb/KR_Korean.keyprop share/gnome/gkb/LA_Lao_x.keyprop share/gnome/gkb/LT_Lithuanian.keyprop share/gnome/gkb/LT_Lithuanian_x.keyprop @@ -171,7 +181,9 @@ share/gnome/gkb/TR_Turkish_x.keyprop share/gnome/gkb/Thai.keyprop share/gnome/gkb/Thai2.keyprop share/gnome/gkb/UA_Ukrainian.keyprop +share/gnome/gkb/UK-x86.keyprop share/gnome/gkb/UK.keyprop +share/gnome/gkb/US-101A-x86.keyprop share/gnome/gkb/US-101.keyprop share/gnome/gkb/US-84.keyprop share/gnome/gkb/US-dec.keyprop @@ -184,8 +196,9 @@ share/gnome/gkb/US.keyprop share/gnome/gkb/US_English.keyprop share/gnome/gkb/US_international.keyprop share/gnome/gkb/VN_Vietnamese.keyprop -share/gnome/gkb/YU_Serbo-Croatian_x.keyprop +share/gnome/gkb/YU_Serb_x.keyprop share/gnome/gkb/Yugoslav.keyprop +share/gnome/gkb/presets.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml @@ -198,6 +211,7 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemlightsApplet.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml +share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml share/gnome/gweather/Locations %%BATTERY%%share/gnome/help/battstat/C/battstat.xml %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-apperance.png @@ -223,6 +237,12 @@ share/gnome/help/char-palette/C/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/legal.xml +share/gnome/help/drivemount/C/drivemount.xml +share/gnome/help/drivemount/C/figures/drivemount_applet_all.png +share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png +share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png +share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png +share/gnome/help/drivemount/C/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml @@ -242,14 +262,25 @@ share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml share/gnome/help/mixer_applet2/C/topic.dat %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf +@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/cdplayer-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/char-palette-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/command-line-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-applets/drivemount-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/geyes-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gkb-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gtik2_applet2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/gweather-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-applets/mixer_applet2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true %%BATTERY%%share/gnome/pixmaps/battstat.png share/gnome/pixmaps/charpick.png share/gnome/pixmaps/drivemount-applet.png @@ -293,7 +324,9 @@ share/gnome/pixmaps/gkb/it.png share/gnome/pixmaps/gkb/jo.png share/gnome/pixmaps/gkb/jp.png share/gnome/pixmaps/gkb/km.png +share/gnome/pixmaps/gkb/kr.png share/gnome/pixmaps/gkb/kw.png +share/gnome/pixmaps/gkb/lam.png share/gnome/pixmaps/gkb/la.png share/gnome/pixmaps/gkb/lb.png share/gnome/pixmaps/gkb/lt.png @@ -316,6 +349,7 @@ share/gnome/pixmaps/gkb/se.png share/gnome/pixmaps/gkb/si.png share/gnome/pixmaps/gkb/sk.png share/gnome/pixmaps/gkb/so.png +share/gnome/pixmaps/gkb/sr.png share/gnome/pixmaps/gkb/su.png share/gnome/pixmaps/gkb/sv.png share/gnome/pixmaps/gkb/sy.png @@ -343,7 +377,16 @@ share/gnome/pixmaps/mixer/volume-medium.png share/gnome/pixmaps/mixer/volume-min.png share/gnome/pixmaps/mixer/volume-mute.png share/gnome/pixmaps/mixer/volume-zero.png +share/gnome/pixmaps/wireless-applet/broken-0.png +share/gnome/pixmaps/wireless-applet/no-link-0.png +share/gnome/pixmaps/wireless-applet/signal-1-40.png +share/gnome/pixmaps/wireless-applet/signal-41-60.png +share/gnome/pixmaps/wireless-applet/signal-61-80.png +share/gnome/pixmaps/wireless-applet/signal-81-100.png +share/gnome/pixmaps/wireless-applet/wireless-applet.png +share/gnome/wireless-applet/wireless-applet.glade share/gnome/xmodmap/xmodmap.am +share/gnome/xmodmap/xmodmap.ar share/gnome/xmodmap/xmodmap.be share/gnome/xmodmap/xmodmap.bg share/gnome/xmodmap/xmodmap.br @@ -357,9 +400,11 @@ share/gnome/xmodmap/xmodmap.dk share/gnome/xmodmap/xmodmap.dvorak share/gnome/xmodmap/xmodmap.ee share/gnome/xmodmap/xmodmap.es +share/gnome/xmodmap/xmodmap.es_x86 share/gnome/xmodmap/xmodmap.fi share/gnome/xmodmap/xmodmap.fr share/gnome/xmodmap/xmodmap.fr-2 +share/gnome/xmodmap/xmodmap.fr_x86 share/gnome/xmodmap/xmodmap.gb share/gnome/xmodmap/xmodmap.gb-102 share/gnome/xmodmap/xmodmap.gb-105 @@ -374,11 +419,13 @@ share/gnome/xmodmap/xmodmap.hu-lat1 share/gnome/xmodmap/xmodmap.hu-sun-lat2 share/gnome/xmodmap/xmodmap.hu.old share/gnome/xmodmap/xmodmap.hu_latin1 +share/gnome/xmodmap/xmodmap.hu_x86 share/gnome/xmodmap/xmodmap.il share/gnome/xmodmap/xmodmap.il_phonetic share/gnome/xmodmap/xmodmap.is share/gnome/xmodmap/xmodmap.it share/gnome/xmodmap/xmodmap.jp +share/gnome/xmodmap/xmodmap.kr share/gnome/xmodmap/xmodmap.la share/gnome/xmodmap/xmodmap.lt share/gnome/xmodmap/xmodmap.lt_b @@ -405,7 +452,9 @@ share/gnome/xmodmap/xmodmap.th share/gnome/xmodmap/xmodmap.tr_f share/gnome/xmodmap/xmodmap.tr_q share/gnome/xmodmap/xmodmap.uk +share/gnome/xmodmap/xmodmap.uk_x86 share/gnome/xmodmap/xmodmap.us +share/gnome/xmodmap/xmodmap.us101A_x86 share/gnome/xmodmap/xmodmap.us-101 share/gnome/xmodmap/xmodmap.us-84 share/gnome/xmodmap/xmodmap.us-dec @@ -435,12 +484,15 @@ share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo share/locale/gl/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo @@ -461,6 +513,7 @@ share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/xmodmap +@dirrm share/gnome/wireless-applet @dirrm share/gnome/pixmaps/mixer @dirrm share/gnome/pixmaps/mini-commander @dirrm share/gnome/pixmaps/gweather @@ -475,12 +528,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gkb/C/figures -@dirrm share/gnome/help/gkb/C -@dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes +@dirrm share/gnome/help/drivemount/C/figures +@dirrm share/gnome/help/drivemount/C +@dirrm share/gnome/help/drivemount @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line @@ -490,18 +543,11 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/cdplayer/C/figures @dirrm share/gnome/help/cdplayer/C @dirrm share/gnome/help/cdplayer -%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/C -%%BATTERY%%@dirrm share/gnome/help/battstat @dirrm share/gnome/gweather @dirrm share/gnome/gkb -@dirrm share/gnome/geyes/Horrid -@dirrm share/gnome/geyes/Default-tiny -@dirrm share/gnome/geyes/Default -@dirrm share/gnome/geyes/Bloodshot -@dirrm share/gnome/geyes/Bizarre -@dirrm share/gnome/geyes +@dirrm share/gnome/gen_util %%BATTERY%%@dirrm share/gnome/battstat_applet +@dirrm libexec/gnome-applets @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/multiload @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/modemlights/prefs @@ -524,3 +570,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet +@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gkb-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gtik2_applet2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/gweather-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/mixer_applet2-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 323915fab1ef..8f1c292a4c49 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.0.10 +PORTVERSION= 2.2.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.0 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.2 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 49d280e227f2..3ebb8fa8c311 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-desktop-2.0.10.tar.bz2) = 5a04d472ce8c6be6a823d348362a6d0b +MD5 (gnome2/gnome-desktop-2.2.0.1.tar.bz2) = 5463b9a864447d670d1ea40de2022519 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index cbd05d5d550e..c1eb5c92f788 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -1,11 +1,10 @@ bin/gnome-about include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h -include/gnome-desktop-2.0/libgnome/gnome-icon-loader.h include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.0 +lib/libgnome-desktop-2.so.3 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/gnome-about/contributors.dat share/gnome/gnome-about/gnome-version.xml @@ -18,15 +17,13 @@ share/gnome/vfolders/Applications.directory share/gnome/vfolders/Development.directory share/gnome/vfolders/Games.directory share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Home.directory share/gnome/vfolders/Internet.directory share/gnome/vfolders/Multimedia.directory share/gnome/vfolders/Office.directory share/gnome/vfolders/Root.directory -share/gnome/vfolders/Root.order share/gnome/vfolders/Settings.directory -share/gnome/vfolders/Settings.order share/gnome/vfolders/System.directory +share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/cdeappmenu.png @@ -155,7 +152,6 @@ share/gnome/pixmaps/panel-folder.png share/gnome/pixmaps/panel-knob.png share/gnome/pixmaps/panel-menu-main.png share/gnome/pixmaps/vnterm.xpm -share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/az/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/be/LC_MESSAGES/gnome-desktop-2.0.mo @@ -183,6 +179,7 @@ share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/mk/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ms/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/nn/LC_MESSAGES/gnome-desktop-2.0.mo @@ -195,9 +192,11 @@ share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sp/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/sv/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ta/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index a28b5926035f..db2138760fbb 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,21 +6,21 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.0.11 +PORTVERSION= 2.2.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.0 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.2 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= wnck-1.4:${PORTSDIR}/x11-toolkits/libwnck \ - gnome-desktop-2.0:${PORTSDIR}/x11/gnomedesktop +LIB_DEPENDS= wnck-1.9:${PORTSDIR}/x11-toolkits/libwnck \ + gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_SHLIB= yes +USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack gnomehier diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index 66c1e6cb333f..e6e3514326ed 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-panel-2.0.11.tar.bz2) = 27345e392e336df85ca4fe44af90a3f4 +MD5 (gnome2/gnome-panel-2.2.0.1.tar.bz2) = cd8a74425cadadc8d10ab1fe5e9e3fe8 diff --git a/x11/gnomepanel/files/patch-config.h.in b/x11/gnomepanel/files/patch-config.h.in index cb37ef76389a..8a59166a57b7 100644 --- a/x11/gnomepanel/files/patch-config.h.in +++ b/x11/gnomepanel/files/patch-config.h.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- config.h.in 2002/05/14 14:15:00 1.1 -+++ config.h.in 2002/05/14 14:15:35 -@@ -148,6 +148,8 @@ - /* Define if you have the `strdup' function. */ - #undef HAVE_STRDUP +--- config.h.in.orig Thu Jan 2 19:50:41 2003 ++++ config.h.in Mon Jan 6 13:11:12 2003 +@@ -96,6 +96,8 @@ + /* Define to 1 if you have the <stdlib.h> header file. */ + #undef HAVE_STDLIB_H +#undef HAVE_LANGINFO_H + - /* Define if you have the <strings.h> header file. */ + /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H diff --git a/x11/gnomepanel/files/patch-configure b/x11/gnomepanel/files/patch-configure index 89007e07bc69..a94d4761c395 100644 --- a/x11/gnomepanel/files/patch-configure +++ b/x11/gnomepanel/files/patch-configure @@ -1,22 +1,19 @@ - -$FreeBSD$ - ---- configure.orig Tue May 14 17:16:32 2002 -+++ configure Tue May 14 17:17:03 2002 -@@ -7232,6 +7232,7 @@ +--- configure.orig Mon Jan 6 01:04:20 2003 ++++ configure Mon Jan 6 13:12:56 2003 +@@ -4254,7 +4254,7 @@ - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -9288,7 +9289,7 @@ - # On IRIX 5.3, sys/types and inttypes.h are conflicting. for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h + inttypes.h stdint.h unistd.h langinfo.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - echo "$as_me:9294: checking for $ac_header" >&5 + echo "$as_me:$LINENO: checking for $ac_header" >&5 +@@ -7878,6 +7878,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/x11/gnomepanel/files/patch-temp b/x11/gnomepanel/files/patch-temp deleted file mode 100644 index a863cbbc8bd9..000000000000 --- a/x11/gnomepanel/files/patch-temp +++ /dev/null @@ -1,441 +0,0 @@ -This patch reverts fully rev.1.50 of xstuff.c and rev.1.22 of xstuff.h, as -well as partially rev.1.302 of session.c and rev.1.176 of basep-widget.c. -The goal is to make Nautilus recognizing presence of the panel on screen, -so that it doesn't put its icons under the panel(s). For some reason, -advertized in ChangeLog _NET_WM_WORKAREA isn't recognised by Nautilus-2.0.0 -available at this time. - ---- gnome-panel/xstuff.c.orig Sun Aug 4 18:30:21 2002 -+++ gnome-panel/xstuff.c Thu Aug 8 22:19:15 2002 -@@ -8,46 +8,97 @@ - * Mark McLoughlin <mark@skynet.ie> - */ - #include <config.h> --#include <string.h> -- --#include <gdk/gdk.h> - #include <gdk/gdkx.h> -+#include <string.h> - -+#include <X11/Xmd.h> - #include <X11/Xlib.h> - #include <X11/Xatom.h> - --#include "xstuff.h" -+/* Yes, yes I know, now bugger off ... */ -+#define WNCK_I_KNOW_THIS_IS_UNSTABLE -+#include <libwnck/libwnck.h> - -+#include "xstuff.h" -+#include "multiscreen-stuff.h" -+#include "basep-widget.h" -+#include "foobar-widget.h" - #include "global-keys.h" - --static Atom --panel_atom_get (Display *display, -- const char *atom_name) -+/*list of all panel widgets created*/ -+extern GSList *panel_list; -+ -+static void xstuff_setup_global_desktop_area (int left, int right, -+ int top, int bottom); -+ -+#define ATOM(name) xstuff_atom_intern(GDK_DISPLAY(),name) -+/* Once we have multiple display support we need to only use -+ * the below ones */ -+ -+#define ATOMD(display,name) xstuff_atom_intern(display,name) -+#define ATOMEV(event,name) xstuff_atom_intern(((XAnyEvent *)event)->display,name) -+#define ATOMGDK(win,name) xstuff_atom_intern(GDK_WINDOW_XDISPLAY(win),name) -+ -+Atom -+xstuff_atom_intern (Display *display, const char *name) - { -- static GHashTable *atom_hash; -- Atom retval; -+ static GHashTable *cache = NULL; -+ char *key; -+ Atom atom; - - g_return_val_if_fail (display != NULL, None); -- g_return_val_if_fail (atom_name != NULL, None); -+ g_return_val_if_fail (name != NULL, None); -+ -+ if (cache == 0) -+ cache = g_hash_table_new (g_str_hash, g_str_equal); - -- if (!atom_hash) -- atom_hash = g_hash_table_new_full ( -- g_str_hash, g_str_equal, g_free, NULL); -- -- retval = GPOINTER_TO_UINT (g_hash_table_lookup (atom_hash, atom_name)); -- if (!retval) { -- retval = XInternAtom (display, atom_name, FALSE); -- -- if (retval != None) -- g_hash_table_insert (atom_hash, g_strdup (atom_name), -- GUINT_TO_POINTER (retval)); -+ key = g_strdup_printf ("%p %s", display, name); -+ -+ atom = (Atom)g_hash_table_lookup (cache, key); -+ if (atom == 0) { -+ atom = XInternAtom (display, name, False); -+ g_hash_table_insert (cache, key, (gpointer)atom); -+ } else { -+ g_free (key); - } - -- return retval; -+ return atom; -+} -+ -+void -+xstuff_init (void) -+{ -+ /* setup the keys filter */ -+ gdk_window_add_filter (gdk_get_default_root_window (), -+ panel_global_keys_filter, -+ NULL); -+ -+ gdk_error_trap_push (); -+ -+ xstuff_setup_global_desktop_area (0, 0, 0, 0); -+ -+ gdk_error_trap_pop (); -+} -+ -+void -+xstuff_set_simple_hint (GdkWindow *w, const char *name, long val) -+{ -+ Atom atom = ATOMGDK (w, name); -+ -+ gdk_error_trap_push (); -+ -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_WINDOW_XWINDOW (w), -+ atom, atom, -+ 32, PropModeReplace, -+ (unsigned char*)&val, 1); -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); - } - - /* Stolen from deskguide */ --static gpointer -+gpointer - get_typed_property_data (Display *xdisplay, - Window xwindow, - Atom property, -@@ -156,7 +207,7 @@ - - data = get_typed_property_data (GDK_DISPLAY (), - GDK_ROOT_WINDOW (), -- panel_atom_get (GDK_DISPLAY (), "_NET_SUPPORTED"), -+ ATOM ("_NET_SUPPORTED"), - XA_ATOM, - &size, 32); - if (data != NULL) { -@@ -176,11 +227,9 @@ - - XDeleteProperty (GDK_WINDOW_XDISPLAY (win), - GDK_WINDOW_XWINDOW (win), -- panel_atom_get (GDK_WINDOW_XDISPLAY (win), -- "WM_CLIENT_LEADER")); -+ ATOMGDK (win, "WM_CLIENT_LEADER")); - -- old_wmhints = XGetWMHints (GDK_WINDOW_XDISPLAY (win), -- GDK_WINDOW_XWINDOW (win)); -+ old_wmhints = XGetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (win)); - /* General paranoia */ - if (old_wmhints != NULL) { - memcpy (&wmhints, old_wmhints, sizeof (XWMHints)); -@@ -197,16 +246,124 @@ - wmhints.input = False; - wmhints.initial_state = NormalState; - } -- -- XSetWMHints (GDK_WINDOW_XDISPLAY (win), -+ XSetWMHints (GDK_DISPLAY (), - GDK_WINDOW_XWINDOW (win), - &wmhints); - } - -+ -+static void -+xstuff_setup_global_desktop_area (int left, int right, int top, int bottom) -+{ -+ long vals[4]; -+ static int old_left = -1, old_right = -1, old_top = -1, old_bottom = -1;+ -+ left = left >= 0 ? left : old_left; -+ right = right >= 0 ? right : old_right; -+ top = top >= 0 ? top : old_top; -+ bottom = bottom >= 0 ? bottom : old_bottom; -+ -+ if (old_left == left && -+ old_right == right && -+ old_top == top && -+ old_bottom == bottom) -+ return; -+ -+ vals[0] = left; -+ vals[1] = right; -+ vals[2] = top; -+ vals[3] = bottom; -+ -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM ("GNOME_PANEL_DESKTOP_AREA"), -+ XA_CARDINAL, -+ 32, PropModeReplace, -+ (unsigned char *)vals, 4); -+ -+ old_left = left; -+ old_right = right; -+ old_top = top; -+ old_bottom = bottom; -+} -+ -+void -+xstuff_setup_desktop_area (int screen, int left, int right, int top, int bottom) -+{ -+ char *screen_atom; -+ long vals[4]; -+ static int screen_width = -1, screen_height = -1; -+ -+ if (screen_width < 0) -+ screen_width = gdk_screen_width (); -+ if (screen_height < 0) -+ screen_height = gdk_screen_height (); -+ -+ vals[0] = left; -+ vals[1] = right; -+ vals[2] = top; -+ vals[3] = bottom; -+ -+ gdk_error_trap_push (); -+ -+ /* Note, when we do standard multihead and we have per screen -+ * root window, this should just set the GNOME_PANEL_DESKTOP_AREA */ -+ screen_atom = g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", -+ screen); -+ XChangeProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM (screen_atom), -+ XA_CARDINAL, -+ 32, PropModeReplace, -+ (unsigned char *)vals, 4); -+ -+ g_free (screen_atom); -+ -+ xstuff_setup_global_desktop_area -+ ((multiscreen_x (screen) == 0) ? left : -1, -+ (multiscreen_x (screen) + -+ multiscreen_width (screen) == screen_width) ? right : -1, -+ (multiscreen_y (screen) == 0) ? top : -1, -+ (multiscreen_y (screen) + -+ multiscreen_height (screen) == screen_height) ? bottom : -1); -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); -+} -+ -+void -+xstuff_unsetup_desktop_area (void) -+{ -+ int i; -+ char *screen_atom; -+ -+ gdk_error_trap_push (); -+ -+ XDeleteProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM ("GNOME_PANEL_DESKTOP_AREA")); -+ -+ for (i = 0; i < multiscreen_screens (); i++) { -+ screen_atom = -+ g_strdup_printf ("GNOME_PANEL_DESKTOP_AREA_%d", i); -+ -+ XDeleteProperty (GDK_DISPLAY (), -+ GDK_ROOT_WINDOW (), -+ ATOM (screen_atom)); -+ -+ g_free (screen_atom); -+ } -+ -+ gdk_flush (); -+ gdk_error_trap_pop (); -+} -+ -+ -+ - /* This is such a broken stupid function. */ - void - xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h) - { -+ Window win = GDK_WINDOW_XWINDOW (window); - XSizeHints size_hints; - int old_x, old_y, old_w, old_h; - -@@ -231,9 +388,7 @@ - - gdk_error_trap_push (); - -- XSetWMNormalHints (GDK_WINDOW_XDISPLAY (window), -- GDK_WINDOW_XWINDOW (window), -- &size_hints); -+ XSetWMNormalHints (GDK_DISPLAY (), win, &size_hints); - - gdk_window_move_resize (window, x, y, w, h); - -@@ -250,33 +405,29 @@ - xstuff_set_wmspec_dock_hints (GdkWindow *window, - gboolean autohide) - { -- Atom atoms [2] = { None, None }; -+ Atom atoms[2] = { None, None }; - -- if (!autohide) -- atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE_DOCK"); -- else { -- atoms [0] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL"); -- atoms [1] = panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE_DOCK"); -+ if (autohide) { -+ atoms[0] = ATOMGDK (window, "_GNOME_WINDOW_TYPE_AUTOHIDE_PANEL"); -+ atoms[1] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK"); -+ } else { -+ atoms[0] = ATOMGDK (window, "_NET_WM_WINDOW_TYPE_DOCK"); - } - - XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), -- panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_WINDOW_TYPE"), -+ ATOMGDK (window, "_NET_WM_WINDOW_TYPE"), - XA_ATOM, 32, PropModeReplace, -- (unsigned char *) atoms, -+ (guchar *)atoms, - autohide ? 2 : 1); - } - - void - xstuff_set_wmspec_strut (GdkWindow *window, -- int left, -- int right, -- int top, -- int bottom) -+ int left, -+ int right, -+ int top, -+ int bottom) - { - long vals [4]; - -@@ -287,25 +438,15 @@ - - XChangeProperty (GDK_WINDOW_XDISPLAY (window), - GDK_WINDOW_XWINDOW (window), -- panel_atom_get (GDK_WINDOW_XDISPLAY (window), -- "_NET_WM_STRUT"), -+ ATOMGDK (window, "_NET_WM_STRUT"), - XA_CARDINAL, 32, PropModeReplace, -- (unsigned char *) vals, 4); -+ (guchar *)vals, 4); - } - - void - xstuff_delete_property (GdkWindow *window, const char *name) - { -- Display *xdisplay = GDK_WINDOW_XDISPLAY (window); -- Window xwindow = GDK_WINDOW_XWINDOW (window); -- -- XDeleteProperty (xdisplay, xwindow, -- panel_atom_get (xdisplay, name)); --} -- --void --xstuff_init (void) --{ -- gdk_window_add_filter (gdk_get_default_root_window (), -- panel_global_keys_filter, NULL); -+ XDeleteProperty (GDK_WINDOW_XDISPLAY (window), -+ GDK_WINDOW_XWINDOW (window), -+ ATOMGDK (window, name)); - } ---- gnome-panel/xstuff.h.orig Fri Jun 21 02:07:59 2002 -+++ gnome-panel/xstuff.h Thu Aug 8 22:11:31 2002 -@@ -1,15 +1,36 @@ --#ifndef __XSTUFF_H__ --#define __XSTUFF_H__ -+#ifndef XSTUFF_H - --#include <gdk/gdk.h> -+#include <gdk/gdkx.h> -+ -+#include <X11/Xmd.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> - - void xstuff_init (void); -+Atom xstuff_atom_intern (Display *display, -+ const char *name); -+void xstuff_set_simple_hint (GdkWindow *w, -+ const char *name, -+ long val); - void xstuff_delete_property (GdkWindow *window, - const char *name); - gboolean xstuff_is_compliant_wm (void); - -+gpointer get_typed_property_data (Display *xdisplay, -+ Window xwindow, -+ Atom property, -+ Atom requested_type, -+ gint *size_p, -+ guint expected_format); -+ - void xstuff_set_no_group_and_no_input (GdkWindow *win); - -+void xstuff_setup_desktop_area (int screen, -+ int left, -+ int right, -+ int top, -+ int bottom); -+ - void xstuff_unsetup_desktop_area (void); - void xstuff_set_pos_size (GdkWindow *window, - int x, int y, -@@ -22,4 +43,4 @@ - int top, - int bottom); - --#endif /* __XSTUFF_H__ */ -+#endif ---- gnome-panel/basep-widget.c.orig Sun Aug 4 18:29:17 2002 -+++ gnome-panel/basep-widget.c Thu Aug 8 22:11:37 2002 -@@ -2508,6 +2508,11 @@ - BASEP_WIDGET (panel)->screen == screen) - gtk_widget_queue_resize (panel); - } -+ xstuff_setup_desktop_area (screen, -+ sb->left, -+ sb->right, -+ sb->top, -+ sb->bottom); - } - - static guint queue_recalc_id = 0; ---- gnome-panel/session.c.orig Wed Jul 31 20:02:15 2002 -+++ gnome-panel/session.c Thu Aug 8 22:11:41 2002 -@@ -242,6 +242,8 @@ - - gnome_config_sync (); - -+ xstuff_unsetup_desktop_area (); -+ - panel_shell_unregister (); - - gtk_main_quit(); diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index 62253efbfd8e..a8c6fcc9d5dc 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -3,12 +3,14 @@ bin/gnome-panel bin/gnome-panel-preferences bin/gnome-panel-screenshot bin/panel-test-applets +etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/%gconf.xml etc/gconf/gconf.xml.defaults/apps/panel/global/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet/%gconf.xml @@ -26,6 +28,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/ etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001/%gconf.xml @@ -42,6 +45,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs/%gconf.xml etc/gconf/schemas/clock.schemas etc/gconf/schemas/fish.schemas +etc/gconf/schemas/gnome-panel-screenshot.schemas etc/gconf/schemas/mailcheck.schemas etc/gconf/schemas/pager.schemas etc/gconf/schemas/panel-global-config.schemas @@ -57,17 +61,21 @@ lib/libpanel-applet-2.so lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_GenUtilApplet_Factory.server +libdata/bonobo/servers/GNOME_NotificationAreaApplet.server libdata/bonobo/servers/GNOME_Panel.server libdata/pkgconfig/libpanelapplet-2.0.pc libexec/fish-applet-2 +libexec/notification-area-applet share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop share/gnome/gen_util/pager.glade share/gnome/gen_util/tasklist.glade share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml +share/gnome/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml share/gnome/gnome-2.0/ui/GNOME_PagerApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_Popup.xml +share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome/gnome-2.0/ui/GNOME_TasklistApplet.xml share/gnome/gnome-panelrc share/doc/panel-applet/applet-popups.html @@ -81,35 +89,40 @@ share/doc/panel-applet/panel-signals.html share/doc/panel-applet/panelapplet.html share/doc/panel-applet/server-files.html share/doc/panel-applet/session-saving.html +share/gnome/fish/fish.glade share/gnome/gnome-panel/glade/panel-test-applets.glade share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png share/gnome/help/clock/C/legal.xml share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/figures/fish_settings.png share/gnome/help/fish-applet-2/C/fish-applet-2.xml share/gnome/help/fish-applet-2/C/legal.xml -share/gnome/help/mailcheck/C/figures/mailcheck-applet.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/C/figures/mailcheck-properties-mailcheck.png share/gnome/help/mailcheck/C/figures/mailcheck_applet.png share/gnome/help/mailcheck/C/legal.xml share/gnome/help/mailcheck/C/mailcheck.xml +share/gnome/help/notification-area/C/figures/notification-area.png +share/gnome/help/notification-area/C/legal.xml +share/gnome/help/notification-area/C/notification-area.xml share/gnome/help/window-list/C/figures/window_list_applet.png -share/gnome/help/window-list/C/figures/window_list_group.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml share/gnome/help/window-list/C/window-list.xml -share/gnome/help/workspace-switcher/C/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/C/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/C/legal.xml share/gnome/help/workspace-switcher/C/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl share/gnome/omf/gnome-panel/clock-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/fish-applet-2-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/mailcheck-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-panel/notification-area-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/window-list-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/gnome-panel/workspace-switcher-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true share/gnome/panel/gnome-panel-preferences.glade share/gnome/panel/gnome-panel-screenshot.glade share/gnome/pixmaps/fish/fishanim.png @@ -123,6 +136,7 @@ share/gnome/pixmaps/mailcheck/email-eclouds.png share/gnome/pixmaps/mailcheck/email-tiny.png share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png +share/gnome/pixmaps/gnome-show-desktop.png share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo @@ -141,6 +155,7 @@ share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/he/LC_MESSAGES/gnome-panel-2.0.mo share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo @@ -148,6 +163,7 @@ share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo @@ -160,6 +176,7 @@ share/locale/ru/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sp/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo @@ -189,6 +206,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/gen_util @dirrm share/gnome/gnome-panel/glade @dirrm share/gnome/gnome-panel +@dirrm share/gnome/fish @dirrm share/doc/panel-applet @dirrm include/panel-2.0 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/tasklist_applet/prefs @@ -205,6 +223,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects/00000001 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/objects @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/general +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000004 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000003 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/panel/default_profiles/medium/applets/00000002 @@ -222,9 +241,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/pager_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mailcheck_applet +@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_panel_screenshot @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/fish_applet @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet @dirrm etc/gconf/gconf.xml.defaults/apps/panel/global @dirrm etc/gconf/gconf.xml.defaults/apps/panel +@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_panel_screenshot +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/clock-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/fish-applet-2-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/mailcheck-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/notification-area-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/window-list-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-panel/workspace-switcher-C.omf 2>/dev/null || /usr/bin/true diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 25f637facffc..b18a2db68a72 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,16 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.0.9 +PORTVERSION= 2.2.0.2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-session/2.0 +MASTER_SITE_SUBDIR= sources/gnome-session/2.2 DISTNAME= gnome-session-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui USE_BZIP2= yes USE_X_PREFIX= yes @@ -28,8 +28,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 save-session.1 \ - session-properties.1 +MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 post-patch: diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index d62947fd6993..7a3e911c6bc1 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-session-2.0.9.tar.bz2) = 55659ab1dbcc521ded652aadc309287d +MD5 (gnome2/gnome-session-2.2.0.2.tar.bz2) = e53f68858792c99ee71954f1fef11bc3 diff --git a/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in new file mode 100644 index 000000000000..9bd6c9a2cf68 --- /dev/null +++ b/x11/gnomesession/files/patch-gnome-session_gnome-session.schemas.in.in @@ -0,0 +1,11 @@ +--- gnome-session/gnome-session.schemas.in.in.orig Mon Oct 14 17:18:15 2002 ++++ gnome-session/gnome-session.schemas.in.in Mon Oct 14 17:17:44 2002 +@@ -50,7 +50,7 @@ + <applyto>/apps/gnome-session/options/splash_image</applyto> + <owner>gnome</owner> + <type>string</type> +- <default>@prefix@/share/pixmaps/splash/gnome-splash.png</default> ++ <default>@datadir@/pixmaps/splash/gnome-splash.png</default> + <locale name="C"> + <short>Splash Screen Image</short> + <long>Preferred Image to use for the splash screen when logging in to the GNOME Desktop</long> diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index a7aa07265800..6f959c8d2217 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -40,6 +40,7 @@ share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo share/locale/lt/LC_MESSAGES/gnome-session-2.0.mo share/locale/lv/LC_MESSAGES/gnome-session-2.0.mo share/locale/mk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo @@ -52,6 +53,7 @@ share/locale/ru/LC_MESSAGES/gnome-session-2.0.mo share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo share/locale/sp/LC_MESSAGES/gnome-session-2.0.mo +share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index 1ebe61ff7ee5..b555f0146410 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,17 +6,22 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.0.2 +PORTVERSION= 2.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.0 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.2 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt \ - gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui + +.if defined(WITH_ZVT) +LIB_DEPENDS+= zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt +.else +LIB_DEPENDS+= vte.4:${PORTSDIR}/x11-toolkits/vte +.endif USE_BZIP2= yes USE_X_PREFIX= yes @@ -29,8 +34,16 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} +.if defined(WITH_ZVT) +CONFIGURE_ARGS= --with-widget=zvt +.else +CONFIGURE_ARGS= --with-widget=vte +.endif + post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \ + ${WRKSRC}/po/Makefile.in.in .include <bsd.port.mk> diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index 47aefe60135d..bb26f7157df0 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1 +1 @@ -MD5 (gnome2/gnome-terminal-2.0.2.tar.bz2) = 3a4a7e523e05296ede8d2a23029a8d50 +MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 0c42fb08539a..52c9e6d8ab6b 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -18,9 +18,18 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/C/figures/terminal_window.png share/gnome/help/gnome-terminal/C/gnome-terminal.xml share/gnome/help/gnome-terminal/C/legal.xml +share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/ro/figures/terminal_window.png +share/gnome/help/gnome-terminal/ro/gnome-terminal.xml +share/gnome/help/gnome-terminal/ro/legal.xml share/gnome/omf/gnome-terminal/gnome-terminal-C.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true +share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf +@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true share/gnome/pixmaps/gnome-terminal.png share/locale/am/LC_MESSAGES/gnome-terminal.mo +share/locale/ar/LC_MESSAGES/gnome-terminal.mo share/locale/be/LC_MESSAGES/gnome-terminal.mo share/locale/bg/LC_MESSAGES/gnome-terminal.mo share/locale/ca/LC_MESSAGES/gnome-terminal.mo @@ -34,12 +43,17 @@ share/locale/et/LC_MESSAGES/gnome-terminal.mo share/locale/fi/LC_MESSAGES/gnome-terminal.mo share/locale/fr/LC_MESSAGES/gnome-terminal.mo share/locale/gl/LC_MESSAGES/gnome-terminal.mo +share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo share/locale/ko/LC_MESSAGES/gnome-terminal.mo share/locale/lt/LC_MESSAGES/gnome-terminal.mo share/locale/lv/LC_MESSAGES/gnome-terminal.mo +share/locale/mk/LC_MESSAGES/gnome-terminal.mo +share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo +share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo share/locale/pl/LC_MESSAGES/gnome-terminal.mo share/locale/pt/LC_MESSAGES/gnome-terminal.mo @@ -48,15 +62,16 @@ share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo +share/locale/sq/LC_MESSAGES/gnome-terminal.mo share/locale/sv/LC_MESSAGES/gnome-terminal.mo -share/locale/ta/LC_MESSAGES/gnome-terminal.mo share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo -@dirrm share/gnome/omf/gnome-terminal +@dirrm share/gnome/help/gnome-terminal/ro/figures +@dirrm share/gnome/help/gnome-terminal/ro @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings @@ -67,3 +82,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/keybindings @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true +@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 4c083e30cdb5..02af321003bc 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnome -PORTVERSION= 2.0.6 +PORTVERSION= 2.2.0.1 CATEGORIES?= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER?= gnome@FreeBSD.org diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 191f34d1164f..edd59de38133 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome2/libgnome-2.0.6.tar.bz2) = 97a8c8f85f8b56174afc638321bfd641 +MD5 (gnome2/libgnome-2.2.0.1.tar.bz2) = 8735919b4ff0a6588f8da9d49220228d diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure index c444fc7c7117..d5a0a23fd4fa 100644 --- a/x11/libgnome/files/patch-configure +++ b/x11/libgnome/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon May 13 13:03:40 2002 -+++ configure Sun May 26 03:43:23 2002 -@@ -7186,6 +7186,7 @@ +--- configure.orig Fri Nov 1 06:34:11 2002 ++++ configure Sat Nov 9 02:15:02 2002 +@@ -7964,6 +7964,7 @@ # This can be used to rebuild libtool when needed LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" @@ -8,12 +8,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -7471,7 +7472,7 @@ - LIBGNOME_AGE=0 +@@ -8335,7 +8336,7 @@ + case $host in - *-linux-gnu | *-irix6*) + *-linux-gnu | *-irix6* | *-freebsd*) - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_MAN_WHEREIS 1 - EOF + _ACEOF diff --git a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in index d2267d824fcf..d8569e65c2db 100644 --- a/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in +++ b/x11/libgnome/files/patch-help-converters::gnome-vfs-module::Makefile.in @@ -1,11 +1,15 @@ ---- help-converters/gnome-vfs-module/Makefile.in.orig Wed Aug 7 01:46:48 2002 -+++ help-converters/gnome-vfs-module/Makefile.in Wed Aug 7 01:49:21 2002 -@@ -138,12 +138,12 @@ +--- help-converters/gnome-vfs-module/Makefile.in.orig Tue Nov 5 00:53:20 2002 ++++ help-converters/gnome-vfs-module/Makefile.in Tue Nov 5 00:56:05 2002 +@@ -138,15 +138,15 @@ cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ --INCLUDES = -I$(top_srcdir) $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" -+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) $(HELP_VFS_MODULE_CFLAGS) -DSERVERDIR=\"$(libexecdir)\" +-INCLUDES = \ +- -I$(top_srcdir) \ ++INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" \ ++ -DX11BASE="\"$(X11BASE)\"" -I$(top_srcdir) \ + $(HELP_VFS_MODULE_CFLAGS) \ + -DSERVERDIR=\"$(libexecdir)\" modules_LTLIBRARIES = libvfs-help.la @@ -14,4 +18,4 @@ +module_flags = -export_dynamic -avoid-version -module modulesdir = $(libdir)/gnome-vfs-2.0/modules - libvfs_help_la_SOURCES = help-method.c help-method.h + libvfs_help_la_SOURCES = \ diff --git a/x11/libgnome/files/patch-libgnome::Makefile.in b/x11/libgnome/files/patch-libgnome::Makefile.in index 6b3a3178efba..21a31faff5fe 100644 --- a/x11/libgnome/files/patch-libgnome::Makefile.in +++ b/x11/libgnome/files/patch-libgnome::Makefile.in @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- libgnome/Makefile.in.orig Fri Apr 26 13:14:03 2002 -+++ libgnome/Makefile.in Fri Apr 26 13:14:03 2002 -@@ -149,7 +149,7 @@ - +--- libgnome/Makefile.in.orig Tue Nov 5 00:56:43 2002 ++++ libgnome/Makefile.in Tue Nov 5 00:58:40 2002 +@@ -149,6 +149,8 @@ libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome --INCLUDES = -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" -+INCLUDES = -DPREFIX="\"$(PREFIX)\"" -DLOCALBASE="\"$(LOCALBASE)\"" -DX11BASE="\"$(X11BASE)\"" -I.. -I$(srcdir)/.. $(WARN_CFLAGS) $(LIBGNOME_CFLAGS) -DG_DISABLE_DEPRECATED -DLIBGNOME_PREFIX=\""$(prefix)"\" -DLIBGNOME_LIBDIR=\""$(libdir)"\" -DLIBGNOME_DATADIR=\""$(datadir)"\" -DLIBGNOME_BINDIR=\""$(bindir)"\" -DLIBGNOME_LOCALSTATEDIR=\""$(localstatedir)"\" -DLIBGNOME_LOCALEDIR=\""$(gnomelocaledir)"\" -DLIBGNOME_SYSCONFDIR=\""$(sysconfdir)"\" -DVERSION=\""$(VERSION)"\" -DGNOMEVFSVERSION=\"$(GNOME_VFS_VERSION)\" -DG_LOG_DOMAIN=\"Gnome\" - - - libgnome_2_la_SOURCES = libgnometypebuiltins.h libgnometypebuiltins.c gnome-config.c gnome-sound.c gnome-triggers.c gnome-triggersP.h gnome-program.c gnome-help.c gnome-exec.c gnome-gconf.c gnome-gconfP.h gnome-i18n.c gnome-i18nP.h gnome-url.c gnome-util.c gnome-score.c gnome-init.c + INCLUDES = \ ++ -DPREFIX="\"$(PREFIX)"\" -DLOCALBASE="\"$(LOCALBASE)\"" \ ++ -DX11BASE="\"$(X11BASE)"\" \ + -I.. \ + -I$(srcdir)/.. \ + $(WARN_CFLAGS) \ diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 826b9f698918..df26639e8376 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -1,3 +1,4 @@ +etc/gconf/gconf.xml.defaults/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml @@ -14,6 +15,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml +etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml @@ -25,6 +27,7 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml @@ -41,6 +44,7 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml +etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications/%gconf.xml etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml @@ -63,6 +67,7 @@ etc/gconf/schemas/desktop_gnome_interface.schemas etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas etc/gconf/schemas/desktop_gnome_sound.schemas +etc/gconf/schemas/desktop_gnome_thumbnailers.schemas etc/gconf/schemas/desktop_gnome_url_handlers.schemas etc/gnome-vfs-2.0/modules/help-methods.conf etc/sound/events/gnome-2.soundlist @@ -86,14 +91,16 @@ lib/bonobo/monikers/libmoniker_extra_2.so lib/gnome-vfs-2.0/modules/libvfs-help.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.0 +lib/libgnome-2.so.200 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc libexec/gnome2-db2html libexec/gnome2-info2html libexec/gnome2-man2html +share/doc/libgnome/home.png share/doc/libgnome/index.html share/doc/libgnome/index.sgml +share/doc/libgnome/left.png share/doc/libgnome/libgnome-gnome-config.html share/doc/libgnome/libgnome-gnome-exec.html share/doc/libgnome/libgnome-gnome-gconf.html @@ -108,10 +115,12 @@ share/doc/libgnome/libgnome-gnome-url.html share/doc/libgnome/libgnome-gnome-util.html share/doc/libgnome/libgnome-libgnometypebuiltins.html share/doc/libgnome/libgnome.html -share/doc/libgnome/x1311.html -share/doc/libgnome/x2881.html -share/doc/libgnome/x3341.html -share/doc/libgnome/x4188.html +share/doc/libgnome/right.png +share/doc/libgnome/up.png +share/doc/libgnome/x1296.html +share/doc/libgnome/x2754.html +share/doc/libgnome/x3411.html +share/doc/libgnome/x4196.html share/gnome/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl share/gnome/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl share/gnome/sgml/docbook/gnome-customization-0.1/l10n.xml @@ -121,20 +130,31 @@ share/locale/az/LC_MESSAGES/libgnome-2.0.mo share/locale/be/LC_MESSAGES/libgnome-2.0.mo share/locale/bg/LC_MESSAGES/libgnome-2.0.mo share/locale/bs/LC_MESSAGES/libgnome-2.0.mo +share/locale/ca/LC_MESSAGES/libgnome-2.0.mo share/locale/cs/LC_MESSAGES/libgnome-2.0.mo share/locale/da/LC_MESSAGES/libgnome-2.0.mo share/locale/de/LC_MESSAGES/libgnome-2.0.mo share/locale/el/LC_MESSAGES/libgnome-2.0.mo +share/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo share/locale/es/LC_MESSAGES/libgnome-2.0.mo +share/locale/et/LC_MESSAGES/libgnome-2.0.mo share/locale/eu/LC_MESSAGES/libgnome-2.0.mo +share/locale/fa/LC_MESSAGES/libgnome-2.0.mo share/locale/fi/LC_MESSAGES/libgnome-2.0.mo share/locale/fr/LC_MESSAGES/libgnome-2.0.mo +share/locale/gl/LC_MESSAGES/libgnome-2.0.mo +share/locale/he/LC_MESSAGES/libgnome-2.0.mo share/locale/hi/LC_MESSAGES/libgnome-2.0.mo +share/locale/hu/LC_MESSAGES/libgnome-2.0.mo share/locale/it/LC_MESSAGES/libgnome-2.0.mo share/locale/ja/LC_MESSAGES/libgnome-2.0.mo share/locale/ko/LC_MESSAGES/libgnome-2.0.mo +share/locale/lt/LC_MESSAGES/libgnome-2.0.mo share/locale/lv/LC_MESSAGES/libgnome-2.0.mo +share/locale/mk/LC_MESSAGES/libgnome-2.0.mo +share/locale/mn/LC_MESSAGES/libgnome-2.0.mo share/locale/ms/LC_MESSAGES/libgnome-2.0.mo +share/locale/nl/LC_MESSAGES/libgnome-2.0.mo share/locale/nn/LC_MESSAGES/libgnome-2.0.mo share/locale/no/LC_MESSAGES/libgnome-2.0.mo share/locale/pl/LC_MESSAGES/libgnome-2.0.mo @@ -166,6 +186,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers +@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard @@ -193,6 +214,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers +@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 437d6e84d411..a3271eb87070 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,15 +6,15 @@ # PORTNAME= yelp -PORTVERSION= 1.0.7 +PORTVERSION= 2.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -LIB_DEPENDS= gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \ +LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \ gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml USE_BZIP2= yes diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index abe9320188b3..5cd3c8fb44b3 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1 +1 @@ -MD5 (gnome2/yelp-1.0.7.tar.bz2) = cc487e4368588155271ce9272f906da0 +MD5 (gnome2/yelp-2.2.0.tar.bz2) = 1148afe2578ad50be59a591677946a4c diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index 7e36d8321ee4..d84546ff459a 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,5 +1,7 @@ +bin/gman bin/gnome-help bin/yelp +bin/yelp-pregenerate libdata/bonobo/servers/GNOME_Yelp.server libexec/yelp-db2html share/gnome/applications/yelp.desktop @@ -134,6 +136,7 @@ share/gnome/sgml/docbook/yelp/yelp-custom.xsl share/gnome/sgml/docbook/yelp/yelp-customization.xsl share/gnome/yelp/catalog share/gnome/yelp/important_docs.xml +share/gnome/yelp/ui/yelp.glade share/locale/am/LC_MESSAGES/yelp.mo share/locale/ar/LC_MESSAGES/yelp.mo share/locale/az/LC_MESSAGES/yelp.mo @@ -146,14 +149,17 @@ share/locale/de/LC_MESSAGES/yelp.mo share/locale/el/LC_MESSAGES/yelp.mo share/locale/es/LC_MESSAGES/yelp.mo share/locale/et/LC_MESSAGES/yelp.mo +share/locale/fi/LC_MESSAGES/yelp.mo share/locale/fr/LC_MESSAGES/yelp.mo share/locale/gl/LC_MESSAGES/yelp.mo share/locale/he/LC_MESSAGES/yelp.mo +share/locale/hi/LC_MESSAGES/yelp.mo share/locale/hu/LC_MESSAGES/yelp.mo share/locale/it/LC_MESSAGES/yelp.mo share/locale/ja/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo +share/locale/mk/LC_MESSAGES/yelp.mo share/locale/ms/LC_MESSAGES/yelp.mo share/locale/nl/LC_MESSAGES/yelp.mo share/locale/nn/LC_MESSAGES/yelp.mo @@ -174,6 +180,7 @@ share/locale/vi/LC_MESSAGES/yelp.mo share/locale/wa/LC_MESSAGES/yelp.mo share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo +@dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp @dirrm share/gnome/sgml/docbook/yelp/docbook/lib @dirrm share/gnome/sgml/docbook/yelp/docbook/images |