diff options
567 files changed, 9616 insertions, 9419 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index f3ee2481e754..4c4ec4d0e1dd 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -1,16 +1,16 @@ -# New ports collection makefile for: atk -# Date Created: 14 May 2001 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> +# New ports collection makefile for: atk +# Date Created: 14 May 2001 +# Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ # PORTNAME= atk -PORTVERSION= 1.8.0 +PORTVERSION= 1.9.1 CATEGORIES= accessibility devel MASTER_SITES= ${MASTER_SITE_GNOME} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.8 + ftp://ftp.gtk.org/pub/gtk/v2.6/ +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.9 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo index ac7f3c0887bc..c6fba736eec7 100644 --- a/accessibility/atk/distinfo +++ b/accessibility/atk/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/atk-1.8.0.tar.bz2) = fc46940febb0e91427b77457e6356f3d -SIZE (gnome2/atk-1.8.0.tar.bz2) = 500156 +MD5 (gnome2/atk-1.9.1.tar.bz2) = 689eb6a77215858eb804f6dcc90058be +SIZE (gnome2/atk-1.9.1.tar.bz2) = 483363 diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist index 5e0de79d6386..6711eb473ba6 100644 --- a/accessibility/atk/pkg-plist +++ b/accessibility/atk/pkg-plist @@ -26,41 +26,12 @@ 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.800 +lib/libatk-1.0.so.901 libdata/pkgconfig/atk.pc -%%DOCSDIR%%/AtkAction.html -%%DOCSDIR%%/AtkComponent.html -%%DOCSDIR%%/AtkDocument.html -%%DOCSDIR%%/AtkEditableText.html -%%DOCSDIR%%/AtkGObjectAccessible.html -%%DOCSDIR%%/AtkHyperlink.html -%%DOCSDIR%%/AtkHypertext.html -%%DOCSDIR%%/AtkImage.html -%%DOCSDIR%%/AtkNoOpObject.html -%%DOCSDIR%%/AtkNoOpObjectFactory.html -%%DOCSDIR%%/AtkObject.html -%%DOCSDIR%%/AtkObjectFactory.html -%%DOCSDIR%%/AtkRegistry.html -%%DOCSDIR%%/AtkRelation.html -%%DOCSDIR%%/AtkRelationSet.html -%%DOCSDIR%%/AtkSelection.html -%%DOCSDIR%%/AtkStateSet.html -%%DOCSDIR%%/AtkStreamableContent.html -%%DOCSDIR%%/AtkTable.html -%%DOCSDIR%%/AtkText.html -%%DOCSDIR%%/AtkUtil.html -%%DOCSDIR%%/AtkValue.html -%%DOCSDIR%%/atk-AtkState.html -%%DOCSDIR%%/atk.devhelp -%%DOCSDIR%%/atk.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/up.png share/locale/af/LC_MESSAGES/atk10.mo share/locale/am/LC_MESSAGES/atk10.mo +share/locale/ar/LC_MESSAGES/atk10.mo +share/locale/as/LC_MESSAGES/atk10.mo share/locale/az/LC_MESSAGES/atk10.mo share/locale/be/LC_MESSAGES/atk10.mo share/locale/bg/LC_MESSAGES/atk10.mo @@ -120,14 +91,18 @@ share/locale/sr@Latn/LC_MESSAGES/atk10.mo share/locale/sr@ije/LC_MESSAGES/atk10.mo share/locale/sv/LC_MESSAGES/atk10.mo share/locale/ta/LC_MESSAGES/atk10.mo +share/locale/th/LC_MESSAGES/atk10.mo share/locale/tk/LC_MESSAGES/atk10.mo share/locale/tr/LC_MESSAGES/atk10.mo share/locale/uk/LC_MESSAGES/atk10.mo share/locale/vi/LC_MESSAGES/atk10.mo share/locale/wa/LC_MESSAGES/atk10.mo +share/locale/xh/LC_MESSAGES/atk10.mo share/locale/yi/LC_MESSAGES/atk10.mo share/locale/zh_CN/LC_MESSAGES/atk10.mo share/locale/zh_TW/LC_MESSAGES/atk10.mo +@unexec rmdir %D/share/locale/as/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/as 2> /dev/null || true @unexec rmdir %D/share/locale/li/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/li 2> /dev/null || true @unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true diff --git a/accessibility/dasher/Makefile b/accessibility/dasher/Makefile index c93d7ee10dfe..8ada000f1a79 100644 --- a/accessibility/dasher/Makefile +++ b/accessibility/dasher/Makefile @@ -6,8 +6,7 @@ # PORTNAME= dasher -PORTVERSION= 3.2.11 -PORTREVISION= 4 +PORTVERSION= 3.2.15 CATEGORIES= accessibility editors x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/3.2 @@ -22,9 +21,11 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi +USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui atspi \ + libwnck WANT_GNOME= yes USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes USE_REINPLACE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/dasher/distinfo b/accessibility/dasher/distinfo index 9c279f0959c9..02812ef26e43 100644 --- a/accessibility/dasher/distinfo +++ b/accessibility/dasher/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/dasher-3.2.11.tar.bz2) = f3180d8ec786c1ea158cc5ac0894856c -SIZE (gnome2/dasher-3.2.11.tar.bz2) = 2651970 +MD5 (gnome2/dasher-3.2.15.tar.bz2) = a3fa85e32c94c69476e12ecba7d257e7 +SIZE (gnome2/dasher-3.2.15.tar.bz2) = 8981223 diff --git a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc index 93031e47f2c4..05d3c3b835fd 100644 --- a/accessibility/dasher/files/patch-Src_Gtk2_speech.cc +++ b/accessibility/dasher/files/patch-Src_Gtk2_speech.cc @@ -1,20 +1,11 @@ ---- Src/Gtk2/speech.cc.orig Fri Jul 30 15:28:41 2004 -+++ Src/Gtk2/speech.cc Sun Feb 13 20:15:46 2005 -@@ -46,7 +46,7 @@ - - voices = GNOME_Speech_SynthesisDriver_getAllVoices (rv, &ev); - -- if (voices==NULL || BONOBO_EX (&ev)) { -+ if (voices==NULL || BONOBO_EX (&ev) || voices->_length==0) { - printf(_("Unable to initialize voices")); - speaker=NULL; - return; +--- Src/Gtk2/speech.cc.orig Fri Sep 17 06:53:53 2004 ++++ Src/Gtk2/speech.cc Sat Feb 26 01:00:12 2005 @@ -78,7 +78,8 @@ void teardown_speech() { bonobo_object_release_unref (speaker, NULL); - CORBA_free (voices); -+ if (voices != NULL && voices->_length != 0) ++ if (voices != NULL && !BONOBO_EX (&ev) && voices->_length != 0) + CORBA_free (voices); CORBA_exception_free (&ev); diff --git a/accessibility/dasher/pkg-plist b/accessibility/dasher/pkg-plist index 2d6c939517fc..1be84180bf55 100644 --- a/accessibility/dasher/pkg-plist +++ b/accessibility/dasher/pkg-plist @@ -1,6 +1,8 @@ bin/dasher share/gnome/applications/dasher.desktop share/gnome/dasher/alphabet.Armenian.xml +share/gnome/dasher/alphabet.Assamese.xml +share/gnome/dasher/alphabet.Austen.xml share/gnome/dasher/alphabet.Azerbaijani.xml share/gnome/dasher/alphabet.Belarusian.xml share/gnome/dasher/alphabet.Bengali.xml @@ -9,23 +11,37 @@ share/gnome/dasher/alphabet.Esperanto.xml share/gnome/dasher/alphabet.Estonian.xml share/gnome/dasher/alphabet.Filipino.xml share/gnome/dasher/alphabet.Greek.xml +share/gnome/dasher/alphabet.Gujarati.xml share/gnome/dasher/alphabet.Hebrew.xml +share/gnome/dasher/alphabet.Hindi.xml share/gnome/dasher/alphabet.Icelandic.xml share/gnome/dasher/alphabet.Igbo.xml share/gnome/dasher/alphabet.Indonesian.xml share/gnome/dasher/alphabet.IrishGaelic.xml +share/gnome/dasher/alphabet.Japanese.xml +share/gnome/dasher/alphabet.Joyo.xml +share/gnome/dasher/alphabet.Joyo2.xml +share/gnome/dasher/alphabet.Kannada.xml +share/gnome/dasher/alphabet.Katakana.xml share/gnome/dasher/alphabet.Malay.xml +share/gnome/dasher/alphabet.Malayalam.xml +share/gnome/dasher/alphabet.Marathi.xml share/gnome/dasher/alphabet.Moldavian.xml share/gnome/dasher/alphabet.Ndebele.xml +share/gnome/dasher/alphabet.Oriya.xml +share/gnome/dasher/alphabet.Punjabi.xml share/gnome/dasher/alphabet.Romanian.xml share/gnome/dasher/alphabet.Sami.xml share/gnome/dasher/alphabet.ScotsGaelic.xml share/gnome/dasher/alphabet.Sepedi.xml share/gnome/dasher/alphabet.Sesotho.xml +share/gnome/dasher/alphabet.Sinhala.xml share/gnome/dasher/alphabet.Slovak.xml share/gnome/dasher/alphabet.Slovenian.xml share/gnome/dasher/alphabet.Swati.xml share/gnome/dasher/alphabet.Tajik.xml +share/gnome/dasher/alphabet.Tamil.xml +share/gnome/dasher/alphabet.Telugu.xml share/gnome/dasher/alphabet.Thai.xml share/gnome/dasher/alphabet.Tsonga.xml share/gnome/dasher/alphabet.Tswana.xml @@ -34,12 +50,20 @@ share/gnome/dasher/alphabet.Vietnamese.xml share/gnome/dasher/alphabet.Xhosa.xml share/gnome/dasher/alphabet.Yoruba.xml share/gnome/dasher/alphabet.Zulu.xml +share/gnome/dasher/alphabet.afrikaans.xml share/gnome/dasher/alphabet.albanian.xml +share/gnome/dasher/alphabet.arabic.xml +share/gnome/dasher/alphabet.bengali.xml +share/gnome/dasher/alphabet.bopomofo.xml +share/gnome/dasher/alphabet.catalan.xml +share/gnome/dasher/alphabet.chinese.xml +share/gnome/dasher/alphabet.chineseRuby.xml share/gnome/dasher/alphabet.czech.xml share/gnome/dasher/alphabet.danish.xml share/gnome/dasher/alphabet.dtd share/gnome/dasher/alphabet.dutch.xml share/gnome/dasher/alphabet.english.xml +share/gnome/dasher/alphabet.english2.xml share/gnome/dasher/alphabet.finnish.xml share/gnome/dasher/alphabet.french.xml share/gnome/dasher/alphabet.german.xml @@ -50,33 +74,77 @@ share/gnome/dasher/alphabet.hungarian.xml share/gnome/dasher/alphabet.hungarianLowerCase.xml share/gnome/dasher/alphabet.ipa.xml share/gnome/dasher/alphabet.italian.xml +share/gnome/dasher/alphabet.klingon.xml share/gnome/dasher/alphabet.korean.xml share/gnome/dasher/alphabet.mongolian.xml +share/gnome/dasher/alphabet.mongolian2.xml share/gnome/dasher/alphabet.norwegian.xml +share/gnome/dasher/alphabet.persian.xml +share/gnome/dasher/alphabet.pinyin.xml share/gnome/dasher/alphabet.polish.xml share/gnome/dasher/alphabet.portuguese.xml share/gnome/dasher/alphabet.russian.xml share/gnome/dasher/alphabet.spanish.xml share/gnome/dasher/alphabet.swahili.xml share/gnome/dasher/alphabet.swedish.xml +share/gnome/dasher/alphabet.thaana.xml +share/gnome/dasher/alphabet.venda.xml share/gnome/dasher/alphabet.welsh.xml share/gnome/dasher/alphabet.xsl share/gnome/dasher/colour.dtd share/gnome/dasher/colour.hiragana.xml share/gnome/dasher/colour.xml share/gnome/dasher/dasher.glade +share/gnome/dasher/training_Afrikaans_ZA.txt +share/gnome/dasher/training_Assamese_IN.txt +share/gnome/dasher/training_English_ZA.txt +share/gnome/dasher/training_Esperanto_XX.txt +share/gnome/dasher/training_Gujarati_IN.txt +share/gnome/dasher/training_Hindi_IN.txt +share/gnome/dasher/training_Japanese_JP.txt +share/gnome/dasher/training_Kannada_IN.txt +share/gnome/dasher/training_Kashmiri_IN.txt +share/gnome/dasher/training_Malayalam_IN.txt +share/gnome/dasher/training_Marathi_IN.txt +share/gnome/dasher/training_Ndebele_ZA.txt +share/gnome/dasher/training_Oriya_IN.txt +share/gnome/dasher/training_Punjabi_IN.txt +share/gnome/dasher/training_Punjabi_IPA_IN.txt +share/gnome/dasher/training_Sepedi_ZA.txt +share/gnome/dasher/training_Sesotho_ZA.txt +share/gnome/dasher/training_Sinhala_IN.txt +share/gnome/dasher/training_Swati_ZA.txt +share/gnome/dasher/training_Tamil_IN.txt +share/gnome/dasher/training_Telugu_IN.txt +share/gnome/dasher/training_Tsonga_ZA.txt +share/gnome/dasher/training_Tswana_ZA.txt +share/gnome/dasher/training_Urdu_PK.txt +share/gnome/dasher/training_Venda_ZA.txt +share/gnome/dasher/training_Xhosa_ZA.txt +share/gnome/dasher/training_Zulu_ZA.txt +share/gnome/dasher/training_albanian_SQ.txt +share/gnome/dasher/training_bengali_BD.txt +share/gnome/dasher/training_bengali_bn.txt share/gnome/dasher/training_czech_CS.txt +share/gnome/dasher/training_danish_DK.txt share/gnome/dasher/training_dutch_NL.txt share/gnome/dasher/training_english_GB.txt +share/gnome/dasher/training_finnish_FI.txt share/gnome/dasher/training_french_FR.txt share/gnome/dasher/training_german_DE.txt +share/gnome/dasher/training_greek_GR.txt share/gnome/dasher/training_hebrew_IL.txt share/gnome/dasher/training_hiragana60_JP.txt share/gnome/dasher/training_hiragana83_JP.txt +share/gnome/dasher/training_hungarian_HU.txt share/gnome/dasher/training_italian_IT.txt share/gnome/dasher/training_mongolian_MN.txt +share/gnome/dasher/training_polish_PL.txt share/gnome/dasher/training_portuguese_BR.txt share/gnome/dasher/training_russian_RU.txt +share/gnome/dasher/training_spanish_ES.txt +share/gnome/dasher/training_swahili_KE.txt +share/gnome/dasher/training_swedish_SE.txt share/gnome/dasher/training_welsh_GB.txt share/gnome/help/dasher/C/dasher.xml share/gnome/help/dasher/C/figures/figure2.png @@ -89,12 +157,12 @@ share/gnome/help/dasher/C/figures/prefs5.png share/gnome/help/dasher/C/version.xml share/gnome/icons/dasher.png share/gnome/omf/dasher/dasher-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true share/locale/ar/LC_MESSAGES/dasher.mo share/locale/az/LC_MESSAGES/dasher.mo share/locale/be/LC_MESSAGES/dasher.mo share/locale/bg/LC_MESSAGES/dasher.mo share/locale/bn/LC_MESSAGES/dasher.mo +share/locale/bs/LC_MESSAGES/dasher.mo share/locale/ca/LC_MESSAGES/dasher.mo share/locale/cs/LC_MESSAGES/dasher.mo share/locale/cy/LC_MESSAGES/dasher.mo @@ -108,7 +176,9 @@ share/locale/et/LC_MESSAGES/dasher.mo share/locale/fi/LC_MESSAGES/dasher.mo share/locale/fr/LC_MESSAGES/dasher.mo share/locale/ga/LC_MESSAGES/dasher.mo +share/locale/gu/LC_MESSAGES/dasher.mo share/locale/he/LC_MESSAGES/dasher.mo +share/locale/hi/LC_MESSAGES/dasher.mo share/locale/hr/LC_MESSAGES/dasher.mo share/locale/hu/LC_MESSAGES/dasher.mo share/locale/id/LC_MESSAGES/dasher.mo @@ -116,8 +186,10 @@ share/locale/it/LC_MESSAGES/dasher.mo share/locale/ja/LC_MESSAGES/dasher.mo share/locale/ko/LC_MESSAGES/dasher.mo share/locale/lt/LC_MESSAGES/dasher.mo +share/locale/mk/LC_MESSAGES/dasher.mo share/locale/mn/LC_MESSAGES/dasher.mo share/locale/ms/LC_MESSAGES/dasher.mo +share/locale/nb/LC_MESSAGES/dasher.mo share/locale/ne/LC_MESSAGES/dasher.mo share/locale/nl/LC_MESSAGES/dasher.mo share/locale/no/LC_MESSAGES/dasher.mo @@ -132,6 +204,8 @@ share/locale/sq/LC_MESSAGES/dasher.mo share/locale/sr/LC_MESSAGES/dasher.mo share/locale/sr@Latn/LC_MESSAGES/dasher.mo share/locale/sv/LC_MESSAGES/dasher.mo +share/locale/ta/LC_MESSAGES/dasher.mo +share/locale/tk/LC_MESSAGES/dasher.mo share/locale/tr/LC_MESSAGES/dasher.mo share/locale/uk/LC_MESSAGES/dasher.mo share/locale/zh_CN/LC_MESSAGES/dasher.mo @@ -141,4 +215,3 @@ share/locale/zh_TW/LC_MESSAGES/dasher.mo @dirrm share/gnome/help/dasher/C @dirrm share/gnome/help/dasher @dirrm share/gnome/dasher -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/dasher/dasher-C.omf 2>/dev/null || /usr/bin/true diff --git a/accessibility/gnopernicus/Makefile b/accessibility/gnopernicus/Makefile index bafc1568f22c..c0d6693a3696 100644 --- a/accessibility/gnopernicus/Makefile +++ b/accessibility/gnopernicus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnopernicus -PORTVERSION= 0.9.19 -PORTREVISION= 1 +PORTVERSION= 0.10.4 CATEGORIES= accessibility x11 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 @@ -30,7 +29,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_ENV= SED="${SED}" GCONF_SCHEMAS= brlmonitor.schemas gnopernicus.schemas remote.schemas -SHLIB_VERSION= 19 +SHLIB_VERSION= 4 PLIST_SUB= SHLIB_VERSION=${SHLIB_VERSION} post-patch: diff --git a/accessibility/gnopernicus/distinfo b/accessibility/gnopernicus/distinfo index 3525083d053d..4fe27d652517 100644 --- a/accessibility/gnopernicus/distinfo +++ b/accessibility/gnopernicus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnopernicus-0.9.19.tar.bz2) = f301f7f7a7324289f44ad7b33bf0282e -SIZE (gnome2/gnopernicus-0.9.19.tar.bz2) = 1927562 +MD5 (gnome2/gnopernicus-0.10.4.tar.bz2) = cb105fa21d63e83c352a1f606d601196 +SIZE (gnome2/gnopernicus-0.10.4.tar.bz2) = 1953427 diff --git a/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c new file mode 100644 index 000000000000..86addc0fc0c7 --- /dev/null +++ b/accessibility/gnopernicus/files/patch-srlow_libsrlow_SRObject.c @@ -0,0 +1,14 @@ +--- srlow/libsrlow/SRObject.c.orig Mon Feb 28 17:11:27 2005 ++++ srlow/libsrlow/SRObject.c Mon Feb 28 17:11:41 2005 +@@ -4206,9 +4206,10 @@ + offset = AccessibleText_getCaretOffset (acc_text); + if (offset == AccessibleText_getCharacterCount (acc_text) && offset > 0) + { ++ char *ret; + offset--; + last = TRUE;/*the char is the last char in the text*/ +- char *ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, ++ ret = AccessibleText_getTextBeforeOffset (acc_text, offset+1, + SPI_TEXT_BOUNDARY_LINE_START, &line_start_offset, &line_end_offset); + SPI_freeString (ret); + if (offset == line_start_offset && offset > 0) diff --git a/accessibility/gok/Makefile b/accessibility/gok/Makefile index 92608ea0f0f2..c8454aea254f 100644 --- a/accessibility/gok/Makefile +++ b/accessibility/gok/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gok -PORTVERSION= 0.11.17 -PORTREVISION= 1 +PORTVERSION= 1.0.2 CATEGORIES= accessibility sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.11 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/accessibility/gok/distinfo b/accessibility/gok/distinfo index a73abe7973dd..d47bf4756a68 100644 --- a/accessibility/gok/distinfo +++ b/accessibility/gok/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gok-0.11.17.tar.bz2) = 6d76c815e7d453cdbfc31f4c45659573 -SIZE (gnome2/gok-0.11.17.tar.bz2) = 1351575 +MD5 (gnome2/gok-1.0.2.tar.bz2) = c4ec4fcd39d43fc0aa43a222ff7ff7cb +SIZE (gnome2/gok-1.0.2.tar.bz2) = 1440562 diff --git a/accessibility/gok/pkg-plist b/accessibility/gok/pkg-plist index bfdaf701d972..560485898394 100644 --- a/accessibility/gok/pkg-plist +++ b/accessibility/gok/pkg-plist @@ -409,6 +409,16 @@ share/gnome/gok/nb/numberpad.kbd share/gnome/gok/nb/quit.kbd share/gnome/gok/nb/text-operations.kbd share/gnome/gok/nb/valuator.kbd +share/gnome/gok/ne/gok-controls.kbd +share/gnome/gok/ne/hide.kbd +share/gnome/gok/ne/launcher.kbd +share/gnome/gok/ne/main.kbd +share/gnome/gok/ne/mouse.kbd +share/gnome/gok/ne/move-resize.kbd +share/gnome/gok/ne/numberpad.kbd +share/gnome/gok/ne/quit.kbd +share/gnome/gok/ne/text-operations.kbd +share/gnome/gok/ne/valuator.kbd share/gnome/gok/nl/gok-controls.kbd share/gnome/gok/nl/hide.kbd share/gnome/gok/nl/launcher.kbd @@ -472,6 +482,16 @@ share/gnome/gok/pt_BR/text-operations.kbd share/gnome/gok/pt_BR/valuator.kbd share/gnome/gok/quit.kbd share/gnome/gok/qwerty.kbd +share/gnome/gok/ro/gok-controls.kbd +share/gnome/gok/ro/hide.kbd +share/gnome/gok/ro/launcher.kbd +share/gnome/gok/ro/main.kbd +share/gnome/gok/ro/mouse.kbd +share/gnome/gok/ro/move-resize.kbd +share/gnome/gok/ro/numberpad.kbd +share/gnome/gok/ro/quit.kbd +share/gnome/gok/ro/text-operations.kbd +share/gnome/gok/ro/valuator.kbd share/gnome/gok/singlekey-automatic-scanning.xam share/gnome/gok/singlekey-inverse-scanning.xam share/gnome/gok/sl/gok-controls.kbd @@ -619,12 +639,14 @@ share/locale/ml/LC_MESSAGES/gok.mo share/locale/mn/LC_MESSAGES/gok.mo share/locale/ms/LC_MESSAGES/gok.mo share/locale/nb/LC_MESSAGES/gok.mo +share/locale/ne/LC_MESSAGES/gok.mo share/locale/nl/LC_MESSAGES/gok.mo share/locale/no/LC_MESSAGES/gok.mo share/locale/pa/LC_MESSAGES/gok.mo share/locale/pl/LC_MESSAGES/gok.mo share/locale/pt/LC_MESSAGES/gok.mo share/locale/pt_BR/LC_MESSAGES/gok.mo +share/locale/ro/LC_MESSAGES/gok.mo share/locale/sl/LC_MESSAGES/gok.mo share/locale/sq/LC_MESSAGES/gok.mo share/locale/sr/LC_MESSAGES/gok.mo @@ -648,12 +670,14 @@ share/locale/zh_TW/LC_MESSAGES/gok.mo @dirrm share/gnome/gok/sr @dirrm share/gnome/gok/sq @dirrm share/gnome/gok/sl +@dirrm share/gnome/gok/ro @dirrm share/gnome/gok/pt_BR @dirrm share/gnome/gok/pt @dirrm share/gnome/gok/pl @dirrm share/gnome/gok/pa @dirrm share/gnome/gok/no @dirrm share/gnome/gok/nl +@dirrm share/gnome/gok/ne @dirrm share/gnome/gok/nb @dirrm share/gnome/gok/ms @dirrm share/gnome/gok/mn diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index f87e29786621..4ba28821efe3 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -6,30 +6,40 @@ # PORTNAME= fileroller -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.8 +MASTER_SITE_SUBDIR= sources/file-roller/2.10 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc +# XXX: We need the ports version of gtar since gtar-1.13.25 included with +# FreeBSD is not sufficient. If the base version of GNU tar is updated, then +# we can do away with this dependency. +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= file-roller.schemas +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/src/fr-command-tar.c + post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in AUTHORS NEWS README TODO diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index 924432cded1e..97e96af0d99b 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4 -SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279 +MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088 +SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026 diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index ea69f1180a69..ea0addced05c 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,73 +1,11 @@ ---- src/fr-command-tar.c.orig Mon Apr 19 15:10:23 2004 -+++ src/fr-command-tar.c Tue Apr 20 02:15:36 2004 -@@ -226,6 +226,11 @@ - return g_strdup (f_start); - } +--- src/fr-command-tar.c.orig Sun Feb 20 17:17:15 2005 ++++ src/fr-command-tar.c Sun Feb 20 17:19:07 2005 +@@ -219,7 +219,7 @@ + /* In solaris gtar is present under /usr/sfw/bin */ -+static char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", -+ "Nov", "Dec" -+}; -+ + prev_path = g_getenv ("PATH"); +- temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin"); ++ temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin"); + putenv (temp); - static void - process_line (char *line, -@@ -234,28 +239,37 @@ - FileData *fdata; - FRCommand *comm = FR_COMMAND (data); - char **fields; -- int date_idx; -- char *field_date, *field_time, *field_size, *field_name; -+ int i; -+ struct tm tm = {0, }; -+ char **time_fields; -+ const char *field_name; - - g_return_if_fail (line != NULL); - - fdata = file_data_new (); - -- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n"); -+ fields = split_line (line, 7); -+ -+ fdata->size = atol (fields[2]); -+ for (i = 0; i < 12; i++) { -+ if (!strncmp(fields[3], months[i], 3)) break; -+ } - -- field_size = get_prev_field (line, date_idx, 1); -- fdata->size = atol (field_size); -- g_free (field_size); -- -- field_date = get_next_field (line, date_idx, 1); -- field_time = get_next_field (line, date_idx, 2); -- fdata->modified = mktime_from_string (field_date, field_time); -- g_free (field_date); -- g_free (field_time); -+ tm.tm_mon = i; -+ tm.tm_year = atoi (fields[6]) - 1900; -+ tm.tm_mday = atoi (fields[4]); -+ time_fields = g_strsplit(fields[5], ":", 2); -+ tm.tm_hour = atoi (time_fields[0]); -+ tm.tm_min = atoi (time_fields[1]); -+ tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ fdata->modified = mktime(&tm); -+ g_strfreev (fields); -+ g_strfreev (time_fields); - - /* Full path */ - -- field_name = tar_get_last_field (line, date_idx, 3); -+ field_name = get_last_field (line, 8); - fields = g_strsplit (field_name, " -> ", 2); - - if (fields[1] == NULL) { -@@ -274,7 +288,6 @@ - if (fields[1] != NULL) - fdata->link = g_strdup (fields[1]); - g_strfreev (fields); -- g_free (field_name); - - fdata->name = g_strdup (file_name_from_path (fdata->full_path)); - fdata->path = remove_level_from_path (fdata->full_path); + path = g_find_program_in_path ("gtar"); diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist index 187b11b08251..139cdaa0f85b 100644 --- a/archivers/file-roller/pkg-plist +++ b/archivers/file-roller/pkg-plist @@ -1,5 +1,6 @@ bin/file-roller lib/bonobo/libfile-roller-component.so +lib/nautilus/extensions-1.0/libnautilus-fileroller.so libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/NEWS @@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml share/gnome/help/file-roller/sv/figures/file-roller_main_window.png share/gnome/help/file-roller/sv/file-roller.xml share/gnome/help/file-roller/sv/legal.xml -share/gnome/help/file-roller/uk/figures/fr-add-dialog.png -share/gnome/help/file-roller/uk/figures/fr-extract.png -share/gnome/help/file-roller/uk/figures/fr-mainwindow.png -share/gnome/help/file-roller/uk/figures/fr-prefs.png +share/gnome/help/file-roller/uk/figures/file-roller_home.png +share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/uk/figures/file-roller_main_window.png +share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png share/gnome/help/file-roller/uk/file-roller.xml share/gnome/help/file-roller/uk/legal.xml share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png @@ -141,6 +143,7 @@ share/locale/tk/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo +share/locale/xh/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index f87e29786621..4ba28821efe3 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -6,30 +6,40 @@ # PORTNAME= fileroller -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/file-roller/2.8 +MASTER_SITE_SUBDIR= sources/file-roller/2.10 DISTNAME= file-roller-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= An archive manager for zip files, tar, etc +# XXX: We need the ports version of gtar since gtar-1.13.25 included with +# FreeBSD is not sufficient. If the base version of GNU tar is updated, then +# we can do away with this dependency. +RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar + USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui desktopfileutils +USE_GNOME= gnomeprefix intlhack gnomehack desktopfileutils nautilus2 USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= file-roller.schemas +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/src/fr-command-tar.c + post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for f in AUTHORS NEWS README TODO diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo index 924432cded1e..97e96af0d99b 100644 --- a/archivers/fileroller/distinfo +++ b/archivers/fileroller/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4 -SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279 +MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088 +SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026 diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index ea69f1180a69..ea0addced05c 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,73 +1,11 @@ ---- src/fr-command-tar.c.orig Mon Apr 19 15:10:23 2004 -+++ src/fr-command-tar.c Tue Apr 20 02:15:36 2004 -@@ -226,6 +226,11 @@ - return g_strdup (f_start); - } +--- src/fr-command-tar.c.orig Sun Feb 20 17:17:15 2005 ++++ src/fr-command-tar.c Sun Feb 20 17:19:07 2005 +@@ -219,7 +219,7 @@ + /* In solaris gtar is present under /usr/sfw/bin */ -+static char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", -+ "Nov", "Dec" -+}; -+ + prev_path = g_getenv ("PATH"); +- temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin"); ++ temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin"); + putenv (temp); - static void - process_line (char *line, -@@ -234,28 +239,37 @@ - FileData *fdata; - FRCommand *comm = FR_COMMAND (data); - char **fields; -- int date_idx; -- char *field_date, *field_time, *field_size, *field_name; -+ int i; -+ struct tm tm = {0, }; -+ char **time_fields; -+ const char *field_name; - - g_return_if_fail (line != NULL); - - fdata = file_data_new (); - -- date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n"); -+ fields = split_line (line, 7); -+ -+ fdata->size = atol (fields[2]); -+ for (i = 0; i < 12; i++) { -+ if (!strncmp(fields[3], months[i], 3)) break; -+ } - -- field_size = get_prev_field (line, date_idx, 1); -- fdata->size = atol (field_size); -- g_free (field_size); -- -- field_date = get_next_field (line, date_idx, 1); -- field_time = get_next_field (line, date_idx, 2); -- fdata->modified = mktime_from_string (field_date, field_time); -- g_free (field_date); -- g_free (field_time); -+ tm.tm_mon = i; -+ tm.tm_year = atoi (fields[6]) - 1900; -+ tm.tm_mday = atoi (fields[4]); -+ time_fields = g_strsplit(fields[5], ":", 2); -+ tm.tm_hour = atoi (time_fields[0]); -+ tm.tm_min = atoi (time_fields[1]); -+ tm.tm_sec = 0; -+ tm.tm_isdst = -1; -+ fdata->modified = mktime(&tm); -+ g_strfreev (fields); -+ g_strfreev (time_fields); - - /* Full path */ - -- field_name = tar_get_last_field (line, date_idx, 3); -+ field_name = get_last_field (line, 8); - fields = g_strsplit (field_name, " -> ", 2); - - if (fields[1] == NULL) { -@@ -274,7 +288,6 @@ - if (fields[1] != NULL) - fdata->link = g_strdup (fields[1]); - g_strfreev (fields); -- g_free (field_name); - - fdata->name = g_strdup (file_name_from_path (fdata->full_path)); - fdata->path = remove_level_from_path (fdata->full_path); + path = g_find_program_in_path ("gtar"); diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist index 187b11b08251..139cdaa0f85b 100644 --- a/archivers/fileroller/pkg-plist +++ b/archivers/fileroller/pkg-plist @@ -1,5 +1,6 @@ bin/file-roller lib/bonobo/libfile-roller-component.so +lib/nautilus/extensions-1.0/libnautilus-fileroller.so libdata/bonobo/servers/File_Roller_Component.server %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/NEWS @@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml share/gnome/help/file-roller/sv/figures/file-roller_main_window.png share/gnome/help/file-roller/sv/file-roller.xml share/gnome/help/file-roller/sv/legal.xml -share/gnome/help/file-roller/uk/figures/fr-add-dialog.png -share/gnome/help/file-roller/uk/figures/fr-extract.png -share/gnome/help/file-roller/uk/figures/fr-mainwindow.png -share/gnome/help/file-roller/uk/figures/fr-prefs.png +share/gnome/help/file-roller/uk/figures/file-roller_home.png +share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/uk/figures/file-roller_main_window.png +share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png share/gnome/help/file-roller/uk/file-roller.xml share/gnome/help/file-roller/uk/legal.xml share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png @@ -141,6 +143,7 @@ share/locale/tk/LC_MESSAGES/file-roller.mo share/locale/tr/LC_MESSAGES/file-roller.mo share/locale/uk/LC_MESSAGES/file-roller.mo share/locale/vi/LC_MESSAGES/file-roller.mo +share/locale/xh/LC_MESSAGES/file-roller.mo share/locale/zh_CN/LC_MESSAGES/file-roller.mo share/locale/zh_TW/LC_MESSAGES/file-roller.mo @dirrm share/gnome/omf/file-roller diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 7da933a5a0cf..ff31e07e5ee3 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.8.0 -PORTREVISION= 4 +PORTVERSION= 2.10.0 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.8 +MASTER_SITE_SUBDIR= sources/gnome-media/2.10 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop USE_BZIP2= yes +INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ - gail +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + gail nautiluscdburner USE_GSTREAMER= esound cdparanoia CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index 57f2938ee07f..10edadbbab8a 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 -SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 +MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88 +SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571 diff --git a/audio/gnome-media/files/patch-cddb-slave2_tcp.c b/audio/gnome-media/files/patch-cddb-slave2_tcp.c new file mode 100644 index 000000000000..f316b7f01301 --- /dev/null +++ b/audio/gnome-media/files/patch-cddb-slave2_tcp.c @@ -0,0 +1,20 @@ +--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004 ++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005 +@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd + continue; + + sa_in6->sin6_scope_id = ifindex; +- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa)); ++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6)); + if (con == 0 || errno == EINPROGRESS) + break; + +@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd + memcpy(&sa, &addr->sa, sizeof(sa)); + sa_in = (struct sockaddr_in *) &sa; + sa_in->sin_family = AF_INET; +- con = connect(s->sockfd, &sa, sizeof(s->sa)); ++ con = connect(s->sockfd, &sa, sizeof(sa)); + } + + /* Connect (but non-blocking!) */ diff --git a/audio/gnome-media/files/patch-gnome-cd_Makefile.in b/audio/gnome-media/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000000..b534f8fec923 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,30 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ diff --git a/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000000..4942519dde40 --- /dev/null +++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,32 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ + return FALSE; + } + ++#if !defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. ++ */ ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } diff --git a/audio/gnome-media/files/patch-grecord_gsr-window.c b/audio/gnome-media/files/patch-grecord_gsr-window.c deleted file mode 100644 index c26eb6889094..000000000000 --- a/audio/gnome-media/files/patch-grecord_gsr-window.c +++ /dev/null @@ -1,57 +0,0 @@ ---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004 -+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004 -@@ -29,7 +29,7 @@ - #include <unistd.h> - - #include <gnome.h> --#include <libgnomevfs/gnome-vfs-utils.h> -+#include <libgnomevfs/gnome-vfs.h> - #include <gconf/gconf-client.h> - #include <gst/gst.h> - #include <gst/gconf/gconf.h> -@@ -475,16 +475,41 @@ - { - GSRWindowPrivate *priv; - GMAudioProfile *profile; -- char *tmp; -+ char *tmp, *src; -+ GnomeVFSURI *src_uri, *dst_uri; - - priv = window->priv; - - profile = gm_audio_profile_choose_get_active (priv->profile); - -- tmp = g_strdup_printf ("%s.%s", name, -+ tmp = g_strdup_printf ("file://%s.%s", name, - gm_audio_profile_get_extension (profile)); -- rename (priv->record_filename, tmp); -- g_free (tmp); -+ src = g_strdup_printf ("file://%s", priv->record_filename); -+ src_uri = gnome_vfs_uri_new (src); -+ dst_uri = gnome_vfs_uri_new (tmp); -+ g_free (src); -+ g_free (tmp); -+ if (src_uri && dst_uri) { -+ GnomeVFSResult result; -+ result = gnome_vfs_xfer_uri (src_uri, dst_uri, -+ GNOME_VFS_XFER_DEFAULT, -+ GNOME_VFS_XFER_ERROR_MODE_ABORT, -+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, -+ NULL, NULL); -+ if (result == GNOME_VFS_OK) { -+ char *title, *short_name; -+ priv->filename = g_strdup_printf ("%s.%s", -+ name, gm_audio_profile_get_extension (profile)); -+ short_name = g_path_get_basename (priv->filename); -+ title = g_strdup_printf ("%s - Sound Recorder", -+ short_name); -+ gtk_window_set_title (GTK_WINDOW (window), title); -+ priv->dirty = FALSE; -+ g_free (title); -+ } -+ gnome_vfs_uri_unref (src_uri); -+ gnome_vfs_uri_unref (dst_uri); -+ } - } - - static void diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index a80344126abe..42fabcc9a822 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor +share/gnome/applications/cddb-slave.desktop share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop -share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/3dsound.png +share/gnome/gnome-media/pixmaps/chain-broken.png +share/gnome/gnome-media/pixmaps/chain.png +share/gnome/gnome-media/pixmaps/headphones.png share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/noplay.png +share/gnome/gnome-media/pixmaps/norecord.png share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/play.png +share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml @@ -434,6 +442,7 @@ share/locale/ml/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/nb/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-media-2.0.mo diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 7da933a5a0cf..ff31e07e5ee3 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomemedia2 -PORTVERSION= 2.8.0 -PORTREVISION= 4 +PORTVERSION= 2.10.0 +PORTREVISION= 2 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-media/2.8 +MASTER_SITE_SUBDIR= sources/gnome-media/2.10 DISTNAME= gnome-media-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,15 +18,15 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Multimedia applications for the GNOME 2 desktop USE_BZIP2= yes +INSTALLS_OMF= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomedesktop \ - gail +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + gail nautiluscdburner USE_GSTREAMER= esound cdparanoia CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index 57f2938ee07f..10edadbbab8a 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-media-2.8.0.tar.bz2) = c200cb577be1adb6bedb8c6528d738a1 -SIZE (gnome2/gnome-media-2.8.0.tar.bz2) = 3171171 +MD5 (gnome2/gnome-media-2.10.0.tar.bz2) = e3b5a422881bfcb7f4082818075e8c88 +SIZE (gnome2/gnome-media-2.10.0.tar.bz2) = 3286571 diff --git a/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c new file mode 100644 index 000000000000..f316b7f01301 --- /dev/null +++ b/audio/gnomemedia2/files/patch-cddb-slave2_tcp.c @@ -0,0 +1,20 @@ +--- cddb-slave2/tcp.c.orig Mon Sep 20 14:52:50 2004 ++++ cddb-slave2/tcp.c Sat Mar 12 03:30:52 2005 +@@ -265,7 +265,7 @@ gnet_tcp_socket_new_async (const GInetAd + continue; + + sa_in6->sin6_scope_id = ifindex; +- con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(s->sa)); ++ con = connect (s->sockfd, (struct sockaddr *)&sa6, sizeof(sa6)); + if (con == 0 || errno == EINPROGRESS) + break; + +@@ -283,7 +283,7 @@ gnet_tcp_socket_new_async (const GInetAd + memcpy(&sa, &addr->sa, sizeof(sa)); + sa_in = (struct sockaddr_in *) &sa; + sa_in->sin_family = AF_INET; +- con = connect(s->sockfd, &sa, sizeof(s->sa)); ++ con = connect(s->sockfd, &sa, sizeof(sa)); + } + + /* Connect (but non-blocking!) */ diff --git a/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in new file mode 100644 index 000000000000..b534f8fec923 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_Makefile.in @@ -0,0 +1,30 @@ +--- gnome-cd/Makefile.in.orig Sat Mar 12 02:52:17 2005 ++++ gnome-cd/Makefile.in Sat Mar 12 03:03:20 2005 +@@ -282,8 +282,8 @@ + libgnomemedia_cddbslave2_la_SOURCES = $(IDL_GENERATED) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = solaris-cdrom.c solaris-cdrom.h + +-@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = bsd-cdrom.c bsd-cdrom.h ++#@HAVE_GSTREAMER_TRUE@cd_sources = gst-cdparanoia-cdrom.c ++@CDROM_HOST_BSD_TRUE@cd_sources = bsd-cdrom.c bsd-cdrom.h + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@cd_sources = linux-cdrom.c linux-cdrom.h + + bin_PROGRAMS = gnome-cd +@@ -352,13 +352,13 @@ + solaris-cdrom.h gst-cdparanoia-cdrom.c bsd-cdrom.c bsd-cdrom.h \ + linux-cdrom.c linux-cdrom.h preferences.c preferences.h \ + cd-selection.c cd-selection.h theme.c +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ +-@CDROM_HOST_BSD_TRUE@@HAVE_GSTREAMER_FALSE@ bsd-cdrom.$(OBJEXT) ++@CDROM_HOST_BSD_TRUE@am__objects_2 = \ ++@CDROM_HOST_BSD_TRUE@ bsd-cdrom.$(OBJEXT) + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_LINUX_TRUE@@HAVE_GSTREAMER_FALSE@ linux-cdrom.$(OBJEXT) + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@am__objects_2 = \ + @CDROM_HOST_SOLARIS_TRUE@@HAVE_GSTREAMER_FALSE@ solaris-cdrom.$(OBJEXT) +-@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) ++#@HAVE_GSTREAMER_TRUE@am__objects_2 = gst-cdparanoia-cdrom.$(OBJEXT) + am_gnome_cd_OBJECTS = eggtrayicon.$(OBJEXT) gnome-cd.$(OBJEXT) \ + callbacks.$(OBJEXT) cddb.$(OBJEXT) cdrom.$(OBJEXT) \ + display.$(OBJEXT) $(am__objects_2) preferences.$(OBJEXT) \ diff --git a/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c new file mode 100644 index 000000000000..4942519dde40 --- /dev/null +++ b/audio/gnomemedia2/files/patch-gnome-cd_gst-cdparanoia-cdrom.c @@ -0,0 +1,32 @@ +--- gnome-cd/gst-cdparanoia-cdrom.c.orig Sat Mar 12 00:09:14 2005 ++++ gnome-cd/gst-cdparanoia-cdrom.c Sat Mar 12 00:19:15 2005 +@@ -1443,15 +1443,18 @@ + return FALSE; + } + ++#if !defined(__FreeBSD__) ++ /* XXX: One cannot send CDIOCCAPABILITY to an atapicam CD-ROM ++ * device. ++ */ ++ + fd = open (device, O_RDONLY | O_NONBLOCK); + if (fd < 0) { + return FALSE; + } + + /* Fire a harmless ioctl at the device. */ +-#if defined(__FreeBSD__) +- if (ioctl (fd, CDIOCCAPABILITY, 0) < 0) { +-#elif defined(__NetBSD__) || defined(__OpenBSD__) ++#if defined(__NetBSD__) || defined(__OpenBSD__) + if (ioctl (fd, CDIOCGETVOL, 0) < 0) { + #else + if (ioctl (fd, CDROM_GET_CAPABILITY, 0) < 0) { +@@ -1463,6 +1466,7 @@ + } + + close (fd); ++#endif /* __FreeBSD__ */ + + return TRUE; + } diff --git a/audio/gnomemedia2/files/patch-grecord_gsr-window.c b/audio/gnomemedia2/files/patch-grecord_gsr-window.c deleted file mode 100644 index c26eb6889094..000000000000 --- a/audio/gnomemedia2/files/patch-grecord_gsr-window.c +++ /dev/null @@ -1,57 +0,0 @@ ---- grecord/src/gsr-window.c.orig Fri Dec 24 15:16:11 2004 -+++ grecord/src/gsr-window.c Fri Dec 24 15:16:13 2004 -@@ -29,7 +29,7 @@ - #include <unistd.h> - - #include <gnome.h> --#include <libgnomevfs/gnome-vfs-utils.h> -+#include <libgnomevfs/gnome-vfs.h> - #include <gconf/gconf-client.h> - #include <gst/gst.h> - #include <gst/gconf/gconf.h> -@@ -475,16 +475,41 @@ - { - GSRWindowPrivate *priv; - GMAudioProfile *profile; -- char *tmp; -+ char *tmp, *src; -+ GnomeVFSURI *src_uri, *dst_uri; - - priv = window->priv; - - profile = gm_audio_profile_choose_get_active (priv->profile); - -- tmp = g_strdup_printf ("%s.%s", name, -+ tmp = g_strdup_printf ("file://%s.%s", name, - gm_audio_profile_get_extension (profile)); -- rename (priv->record_filename, tmp); -- g_free (tmp); -+ src = g_strdup_printf ("file://%s", priv->record_filename); -+ src_uri = gnome_vfs_uri_new (src); -+ dst_uri = gnome_vfs_uri_new (tmp); -+ g_free (src); -+ g_free (tmp); -+ if (src_uri && dst_uri) { -+ GnomeVFSResult result; -+ result = gnome_vfs_xfer_uri (src_uri, dst_uri, -+ GNOME_VFS_XFER_DEFAULT, -+ GNOME_VFS_XFER_ERROR_MODE_ABORT, -+ GNOME_VFS_XFER_OVERWRITE_MODE_REPLACE, -+ NULL, NULL); -+ if (result == GNOME_VFS_OK) { -+ char *title, *short_name; -+ priv->filename = g_strdup_printf ("%s.%s", -+ name, gm_audio_profile_get_extension (profile)); -+ short_name = g_path_get_basename (priv->filename); -+ title = g_strdup_printf ("%s - Sound Recorder", -+ short_name); -+ gtk_window_set_title (GTK_WINDOW (window), title); -+ priv->dirty = FALSE; -+ g_free (title); -+ } -+ gnome_vfs_uri_unref (src_uri); -+ gnome_vfs_uri_unref (dst_uri); -+ } - } - - static void diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index a80344126abe..42fabcc9a822 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -22,16 +22,24 @@ libdata/bonobo/servers/GNOME_Media_CDDBSlave2.server libdata/pkgconfig/gnome-media-profiles.pc libexec/CDDBSlave2 libexec/cddb-track-editor +share/gnome/applications/cddb-slave.desktop share/gnome/applications/gnome-cd.desktop share/gnome/applications/gnome-sound-recorder.desktop share/gnome/applications/gnome-volume-control.desktop +share/gnome/applications/gstreamer-properties.desktop share/gnome/applications/reclevel.desktop share/gnome/applications/vumeter.desktop -share/gnome/control-center-2.0/capplets/cddb-slave.desktop -share/gnome/control-center-2.0/capplets/gstreamer-properties.desktop share/gnome/gnome-media/glade/gnome-audio-profiles.glade2 +share/gnome/gnome-media/pixmaps/3dsound.png +share/gnome/gnome-media/pixmaps/chain-broken.png +share/gnome/gnome-media/pixmaps/chain.png +share/gnome/gnome-media/pixmaps/headphones.png share/gnome/gnome-media/pixmaps/mixer.png +share/gnome/gnome-media/pixmaps/noplay.png +share/gnome/gnome-media/pixmaps/norecord.png share/gnome/gnome-media/pixmaps/phone.png +share/gnome/gnome-media/pixmaps/play.png +share/gnome/gnome-media/pixmaps/record.png share/gnome/gnome-media/pixmaps/tone.png share/gnome/gnome-media/pixmaps/video.png share/gnome/gnome-sound-recorder/ui/gsr.xml @@ -434,6 +442,7 @@ share/locale/ml/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/nb/LC_MESSAGES/gnome-media-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-media-2.0.mo diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile index 1c4baeb4411c..1796cc0cf6c0 100644 --- a/audio/sound-juicer/Makefile +++ b/audio/sound-juicer/Makefile @@ -6,10 +6,10 @@ # PORTNAME= sound-juicer -PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= audio gnome -MASTER_SITES= http://www.burtonini.com/computing/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,14 +18,17 @@ COMMENT= Clean, mean and lean CD ripper for GNOME2 LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \ gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2 +USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes +INSTALLS_OMF= yes USE_REINPLACE= yes -USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui +USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner USE_GSTREAMER= cdparanoia vorbis flac USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-ignore-missing-cd +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" GCONF_SCHEMAS= sound-juicer.schemas diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo index 49ba9dee4363..b235ee6b29aa 100644 --- a/audio/sound-juicer/distinfo +++ b/audio/sound-juicer/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/sound-juicer-0.6.0.tar.gz) = bab9ac8e3f0ba66f360485aafdd379f8 -SIZE (gnome2/sound-juicer-0.6.0.tar.gz) = 597829 +MD5 (gnome2/sound-juicer-2.10.0.tar.bz2) = 2450626f15847d922e47781e3e259b83 +SIZE (gnome2/sound-juicer-2.10.0.tar.bz2) = 503090 diff --git a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c b/audio/sound-juicer/files/patch-src::bacon-cd-selection.c deleted file mode 100644 index 3bf5d559e3a5..000000000000 --- a/audio/sound-juicer/files/patch-src::bacon-cd-selection.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bacon-cd-selection.c.orig Sun Dec 12 10:27:00 2004 -+++ src/bacon-cd-selection.c Sun Dec 12 10:27:57 2004 -@@ -179,10 +179,10 @@ - static void - bacon_cd_selection_init (BaconCdSelection *bcs) - { -- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -- - GtkCellRenderer *cell; - GtkListStore *store; -+ -+ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (bcs), diff --git a/audio/sound-juicer/files/patch-src::cd-drive.c b/audio/sound-juicer/files/patch-src::cd-drive.c deleted file mode 100644 index 56d594fb962f..000000000000 --- a/audio/sound-juicer/files/patch-src::cd-drive.c +++ /dev/null @@ -1,103 +0,0 @@ ---- src/cd-drive.c.orig Sun Dec 12 01:39:32 2004 -+++ src/cd-drive.c Sun Dec 12 01:41:50 2004 -@@ -596,7 +596,49 @@ - - #if defined(__linux__) || defined(__FreeBSD__) - -+#if !defined(__linux) -+static int -+get_device_max_read_speed (char *device) -+{ -+ int fd; -+ int max_speed; -+ int read_speed, write_speed; -+ -+ max_speed = -1; -+ -+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -+ if (fd < 0) { -+ return -1; -+ } - -+ get_read_write_speed (fd, &read_speed, &write_speed); -+ close (fd); -+ max_speed = (int)floor (read_speed) / CD_ROM_SPEED; -+ -+ return max_speed; -+} -+#endif -+ -+static int -+get_device_max_write_speed (char *device) -+{ -+ int fd; -+ int max_speed; -+ int read_speed, write_speed; -+ -+ max_speed = -1; -+ -+ fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -+ if (fd < 0) { -+ return -1; -+ } -+ -+ get_read_write_speed (fd, &read_speed, &write_speed); -+ close (fd); -+ max_speed = (int)floor (write_speed) / CD_ROM_SPEED; -+ -+ return max_speed; -+} - - #endif /* __linux__ || __FreeBSD__ */ - -@@ -798,50 +840,6 @@ - } - } - return NULL; --} -- --#if !defined(__linux) --static int --get_device_max_read_speed (char *device) --{ -- int fd; -- int max_speed; -- int read_speed, write_speed; -- -- max_speed = -1; -- -- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -- if (fd < 0) { -- return -1; -- } -- -- get_read_write_speed (fd, &read_speed, &write_speed); -- close (fd); -- max_speed = (int)floor (read_speed) / CD_ROM_SPEED; -- -- return max_speed; --} --#endif -- --static int --get_device_max_write_speed (char *device) --{ -- int fd; -- int max_speed; -- int read_speed, write_speed; -- -- max_speed = -1; -- -- fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); -- if (fd < 0) { -- return -1; -- } -- -- get_read_write_speed (fd, &read_speed, &write_speed); -- close (fd); -- max_speed = (int)floor (write_speed) / CD_ROM_SPEED; -- -- return max_speed; - } - - static char * diff --git a/audio/sound-juicer/files/patch-src::sj-genres.c b/audio/sound-juicer/files/patch-src::sj-genres.c new file mode 100644 index 000000000000..5bbf888cbed3 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-genres.c @@ -0,0 +1,13 @@ +--- src/sj-genres.c.orig Mon Jan 17 13:22:28 2005 ++++ src/sj-genres.c Mon Jan 17 13:22:34 2005 +@@ -20,9 +20,9 @@ + * Authors: Ross Burton <ross@burtonini.com> + */ + +-#include "sound-juicer.h" + + #include <glib/gi18n.h> ++#include "sound-juicer.h" + + #include "sj-genres.h" + diff --git a/audio/sound-juicer/files/patch-src::sj-main.c b/audio/sound-juicer/files/patch-src::sj-main.c deleted file mode 100644 index 547e5c245d67..000000000000 --- a/audio/sound-juicer/files/patch-src::sj-main.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/sj-main.c.orig Tue Jun 15 19:45:05 2004 -+++ src/sj-main.c Tue Jun 15 19:46:13 2004 -@@ -535,8 +535,9 @@ - */ - void device_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) - { -- g_assert (strcmp (entry->key, GCONF_DEVICE) == 0); - gboolean ignore_no_media = GPOINTER_TO_INT (user_data); -+ -+ g_assert (strcmp (entry->key, GCONF_DEVICE) == 0); - - if (entry->value == NULL - || !cd_drive_exists (gconf_value_get_string (entry->value))) { diff --git a/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c new file mode 100644 index 000000000000..c510a48dc6f4 --- /dev/null +++ b/audio/sound-juicer/files/patch-src::sj-metadata-musicbrainz.c @@ -0,0 +1,18 @@ +--- src/sj-metadata-musicbrainz.c.orig Mon Jan 17 13:22:54 2005 ++++ src/sj-metadata-musicbrainz.c Mon Jan 17 13:23:02 2005 +@@ -18,7 +18,6 @@ + * Boston, MA 02111-1307, USA. + */ + +-#include "sound-juicer.h" + + #include <string.h> + #include <glib-object.h> +@@ -32,6 +31,7 @@ + #include <stdlib.h> + #include <unistd.h> + ++#include "sound-juicer.h" + #include "sj-metadata-musicbrainz.h" + #include "sj-structures.h" + #include "sj-error.h" diff --git a/audio/sound-juicer/files/patch-src::sj-util.c b/audio/sound-juicer/files/patch-src::sj-util.c index feea811fcebb..b29d97bbd4f9 100644 --- a/audio/sound-juicer/files/patch-src::sj-util.c +++ b/audio/sound-juicer/files/patch-src::sj-util.c @@ -1,71 +1,43 @@ ---- src/sj-util.c.orig Tue Jun 15 19:14:09 2004 -+++ src/sj-util.c Tue Jun 15 19:29:16 2004 -@@ -122,6 +122,9 @@ - gtk_widget_destroy (dialog); - goto done; - } -+#ifdef __FreeBSD__ -+ ioctl (fd, CDIOCALLOW); -+#endif - result = ioctl (fd, CDROMEJECT); - if (result == -1) { - GtkWidget *dialog; -@@ -151,20 +154,32 @@ - { - int fd, status; - -+#if defined(__linux__) - fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); +--- src/sj-util.c.orig Tue Feb 8 14:06:57 2005 ++++ src/sj-util.c Tue Feb 8 14:25:03 2005 +@@ -157,6 +157,15 @@ if (fd < 0) { return FALSE; } ++#if defined(__FreeBSD__) ++ status = FALSE; ++ ++ ioctl (fd, CDIOCCLOSE); ++ ++ close (fd); ++ ++ return status; ++#else status = ioctl (fd, CDROM_DRIVE_STATUS, CDSL_CURRENT); -+ close (fd); if (status < 0) { -- close (fd); - return FALSE; - } +@@ -167,6 +176,7 @@ + close (fd); -- close (fd); -- return status == CDS_TRAY_OPEN; -+#elif defined(__FreeBSD__) -+ struct ioc_toc_header h; -+ -+ fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); -+ if (fd < 0) { -+ return FALSE; -+ } -+ -+ status = ioctl (fd, CDIOREADTOCHEADER, &h); -+ close (fd); -+ -+ return status < 0; +#endif } gboolean is_audio_cd (const char *device) -@@ -191,15 +210,19 @@ - return FALSE; +@@ -191,7 +201,7 @@ + default: + return FALSE; } - -+#if defined(__linux__) - status = ioctl (fd, CDROM_DISC_STATUS, CDSL_CURRENT); -+ close (fd); - if (status < 0) { -- close (fd); +- ++/* + fd = open (device, O_RDONLY | O_NONBLOCK | O_EXCL); + if (fd <0) { return FALSE; - } +@@ -206,6 +216,7 @@ + close (fd); -- close (fd); -- return status == CDS_AUDIO; -+#elif defined (__FreeBSD__) -+ return TRUE; -+#else -+ return TRUE; -+#endif ++ */ } /* Pass NULL to use g_free */ diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist index af60b4f7cc77..bab1ce85bba4 100644 --- a/audio/sound-juicer/pkg-plist +++ b/audio/sound-juicer/pkg-plist @@ -9,6 +9,51 @@ share/gnome/omf/sound-juicer/sound-juicer-manual-C.omf share/gnome/pixmaps/sound-juicer.png share/gnome/sound-juicer/orange-slice.png share/gnome/sound-juicer/sound-juicer.glade +share/locale/ar/LC_MESSAGES/sound-juicer.mo +share/locale/az/LC_MESSAGES/sound-juicer.mo +share/locale/be/LC_MESSAGES/sound-juicer.mo +share/locale/bg/LC_MESSAGES/sound-juicer.mo +share/locale/ca/LC_MESSAGES/sound-juicer.mo +share/locale/cs/LC_MESSAGES/sound-juicer.mo +share/locale/da/LC_MESSAGES/sound-juicer.mo +share/locale/de/LC_MESSAGES/sound-juicer.mo +share/locale/el/LC_MESSAGES/sound-juicer.mo +share/locale/en_CA/LC_MESSAGES/sound-juicer.mo +share/locale/en_GB/LC_MESSAGES/sound-juicer.mo +share/locale/es/LC_MESSAGES/sound-juicer.mo +share/locale/et/LC_MESSAGES/sound-juicer.mo +share/locale/eu/LC_MESSAGES/sound-juicer.mo +share/locale/fi/LC_MESSAGES/sound-juicer.mo +share/locale/fr/LC_MESSAGES/sound-juicer.mo +share/locale/gu/LC_MESSAGES/sound-juicer.mo +share/locale/hi/LC_MESSAGES/sound-juicer.mo +share/locale/hr/LC_MESSAGES/sound-juicer.mo +share/locale/hu/LC_MESSAGES/sound-juicer.mo +share/locale/it/LC_MESSAGES/sound-juicer.mo +share/locale/ja/LC_MESSAGES/sound-juicer.mo +share/locale/ko/LC_MESSAGES/sound-juicer.mo +share/locale/lt/LC_MESSAGES/sound-juicer.mo +share/locale/mk/LC_MESSAGES/sound-juicer.mo +share/locale/ml/LC_MESSAGES/sound-juicer.mo +share/locale/ms/LC_MESSAGES/sound-juicer.mo +share/locale/nb/LC_MESSAGES/sound-juicer.mo +share/locale/ne/LC_MESSAGES/sound-juicer.mo +share/locale/nl/LC_MESSAGES/sound-juicer.mo +share/locale/no/LC_MESSAGES/sound-juicer.mo +share/locale/pa/LC_MESSAGES/sound-juicer.mo +share/locale/pl/LC_MESSAGES/sound-juicer.mo +share/locale/pt/LC_MESSAGES/sound-juicer.mo +share/locale/pt_BR/LC_MESSAGES/sound-juicer.mo +share/locale/ru/LC_MESSAGES/sound-juicer.mo +share/locale/sq/LC_MESSAGES/sound-juicer.mo +share/locale/sr/LC_MESSAGES/sound-juicer.mo +share/locale/sr@Latn/LC_MESSAGES/sound-juicer.mo +share/locale/sv/LC_MESSAGES/sound-juicer.mo +share/locale/th/LC_MESSAGES/sound-juicer.mo +share/locale/tr/LC_MESSAGES/sound-juicer.mo +share/locale/uk/LC_MESSAGES/sound-juicer.mo +share/locale/zh_CN/LC_MESSAGES/sound-juicer.mo +share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo @dirrm share/gnome/sound-juicer @dirrm share/gnome/omf/sound-juicer @dirrm share/gnome/help/sound-juicer/C/figures diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index e3265639e59b..f7a5fde2ecf1 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -6,38 +6,50 @@ # PORTNAME= evolution-data-server -PORTVERSION= 1.0.4 +PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup +LIB_DEPENDS= soup-2.2.7:${PORTSDIR}/devel/libsoup \ + nss3.1:${PORTSDIR}/security/nss USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnome +USE_GNOME= gnomeprefix gnomehack intlhack gnometarget libgnomeui USE_REINPLACE= yes USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes -CONFIGURE_ARGS= --enable-static -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PLIST_SUB= VERSION="1.0" EVO_VERSION="1.0" +CONFIGURE_ARGS= --enable-static \ + --enable-nss=yes \ + --with-nss-includes=${LOCALBASE}/include/nss/nss \ + --with-nss-libs=${LOCALBASE}/lib \ + --with-nspr-includes=${LOCALBASE}/include/nspr \ + --with-nspr-libs=${LOCALBASE}/lib \ + --with-krb5=/usr +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + +PLIST_SUB= VERSION="1.2" EVO_VERSION="1.2" + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 600012 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libedataserver_e-msgport.c +.endif .if !defined(WITHOUT_LDAP) USE_OPENLDAP= yes CONFIGURE_ARGS+=--with-openldap=yes -PLIST_SUB+= LDAP="" .else CONFIGURE_ARGS+=--with-openldap=no -PLIST_SUB+= LDAP="@comment " .endif pre-everything:: @@ -46,4 +58,4 @@ pre-everything:: @${ECHO_MSG} " WITHOUT_LDAP Disable LDAP support" @${ECHO_MSG} "" -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo index fc9fd81d63a0..6ac9d80baf96 100644 --- a/databases/evolution-data-server/distinfo +++ b/databases/evolution-data-server/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-data-server-1.0.4.tar.bz2) = 5c9c6cac9b65d392e50ea3214022cb5b -SIZE (gnome2/evolution-data-server-1.0.4.tar.bz2) = 4792220 +MD5 (gnome2/evolution-data-server-1.2.0.tar.bz2) = 9a34499dc8e65af768ab1582803015ef +SIZE (gnome2/evolution-data-server-1.2.0.tar.bz2) = 7427456 diff --git a/mail/evolution/files/patch-e-util_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c index 85bd48595b3d..7383f939f4cd 100644 --- a/mail/evolution/files/patch-e-util_e-msgport.c +++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c @@ -1,6 +1,6 @@ ---- e-util/e-msgport.c.orig Wed Jan 14 00:04:04 2004 -+++ e-util/e-msgport.c Sun Sep 19 14:01:25 2004 -@@ -921,9 +921,13 @@ +--- libedataserver/e-msgport.c.orig Thu Dec 2 22:33:06 2004 ++++ libedataserver/e-msgport.c Wed Mar 9 14:31:46 2005 +@@ -921,9 +921,18 @@ void e_thread_put(EThread *e, EMsg *msg) { pthread_t id; @@ -9,12 +9,17 @@ pthread_mutex_lock(&e->mutex); + pthread_attr_init(&attr); -+ /* Give us a 1 MB thread stack size. */ -+ pthread_attr_setstacksize(&attr, 0x100000); ++ /* Give us a 1 MB thread stacksize on 32-bit architectures, and ++ * a 2 MB thread stacksize on 64-bit architectures. */ ++ if (sizeof (void *) == 8) { ++ pthread_attr_setstacksize(&attr, 0x200000); ++ } else { ++ pthread_attr_setstacksize(&attr, 0x100000); ++ } /* the caller forgot to tell us what to do, well, we can't do anything can we */ if (e->received == NULL) { -@@ -962,13 +966,14 @@ +@@ -962,13 +971,14 @@ e_msgport_put(e->server_port, msg); if (e->waiting == 0 && g_list_length(e->id_list) < e->queue_limit @@ -30,7 +35,7 @@ pthread_mutex_unlock(&e->mutex); return; } -@@ -977,12 +982,13 @@ +@@ -977,12 +987,13 @@ if (e->id == E_THREAD_NONE) { int err; diff --git a/databases/evolution-data-server/files/patch-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure new file mode 100644 index 000000000000..19028e5d49fc --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_libical_configure @@ -0,0 +1,11 @@ +--- calendar/libical/configure.orig Sun Dec 26 16:54:57 2004 ++++ calendar/libical/configure Sun Dec 26 16:55:23 2004 +@@ -19736,7 +19736,7 @@ + + + +-if test "x$USE_MAINTAINER_MODE" == xyes; then ++if test "x$USE_MAINTAINER_MODE" = xyes; then + DEV="yes" + echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5 + echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6 diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in new file mode 100644 index 000000000000..dfd4f33f61e2 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_Makefile.in @@ -0,0 +1,11 @@ +--- camel/Makefile.in.orig Tue Dec 21 13:46:00 2004 ++++ camel/Makefile.in Tue Dec 21 13:46:01 2004 +@@ -299,7 +299,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SUBDIRS = . providers tests ++SUBDIRS = . providers + + pkgconfigdir = $(prefix)/libdata/pkgconfig + pkgconfig_in_files = camel.pc.in camel-provider.pc.in diff --git a/mail/evolution/files/patch-e-util_e-host-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c index 3d92fc70fca2..17bddca39e31 100644 --- a/mail/evolution/files/patch-e-util_e-host-utils.c +++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c @@ -1,6 +1,6 @@ ---- e-util/e-host-utils.c.orig Tue Apr 13 15:19:43 2004 -+++ e-util/e-host-utils.c Sun Oct 3 01:17:57 2004 -@@ -136,12 +136,21 @@ +--- camel/camel-net-utils.c.orig Tue Dec 21 13:38:52 2004 ++++ camel/camel-net-utils.c Tue Dec 21 13:40:34 2004 +@@ -143,12 +143,21 @@ case EAI_SERVICE: return NO_DATA; break; diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index 4959297daf85..7bc7a9cdfb65 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,6 +1,36 @@ ---- configure.orig Thu Jan 29 16:02:10 2004 -+++ configure Thu Jan 29 16:02:39 2004 -@@ -23783,7 +23783,7 @@ +--- configure.orig Tue Dec 21 13:46:01 2004 ++++ configure Tue Dec 21 13:50:02 2004 +@@ -7894,10 +7894,10 @@ + Example: --with-nspr-libs=/usr/lib" >&2;} + { (exit 1); exit 1; }; } + else +- nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" ++ nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB" + fi + else +- nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" ++ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB" + fi + + echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5 +@@ -10011,6 +10011,7 @@ + #include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> ++ #include <stdio.h> + + + int +@@ -10777,7 +10778,7 @@ + LDFLAGS_save="$LDFLAGS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" + echo "$as_me:$LINENO: checking for Kerberos 5" >&5 + echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 + if test "${ac_cv_lib_kerberos5+set}" = set; then +@@ -29833,7 +29834,7 @@ idldir="$datadir/idl/evolution-data-server-$BASE_VERSION" @@ -8,4 +38,4 @@ +serverdir="$prefix/libdata/bonobo/servers" - + extensiondir='${privlibdir}'/extensions diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c new file mode 100644 index 000000000000..62532da02471 --- /dev/null +++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c @@ -0,0 +1,11 @@ +--- libedataserverui/e-source-option-menu.c.orig Tue Nov 23 13:50:14 2004 ++++ libedataserverui/e-source-option-menu.c Tue Nov 23 13:50:33 2004 +@@ -24,6 +24,8 @@ + #include <config.h> + #endif + ++#include <sys/types.h> ++ + #include <gtk/gtkmenu.h> + #include <gtk/gtkmenuitem.h> + diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c new file mode 100644 index 000000000000..576ecea6ae3c --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-connection.c @@ -0,0 +1,12 @@ +--- servers/groupwise/e-gw-connection.c.orig Tue Mar 8 03:50:29 2005 ++++ servers/groupwise/e-gw-connection.c Tue Mar 8 03:50:40 2005 +@@ -1764,8 +1764,8 @@ + EGwConnectionPrivate *priv; + SoupSoapParameter *param, *subparam, *second_level_child; + char *id, *name; +- g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + static GStaticMutex connecting = G_STATIC_MUTEX_INIT; ++ g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_OBJECT); + + priv = cnc->priv; + g_static_mutex_lock (&connecting); diff --git a/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c new file mode 100644 index 000000000000..c865775dae15 --- /dev/null +++ b/databases/evolution-data-server/files/patch-servers_groupwise_e-gw-item.c @@ -0,0 +1,22 @@ +--- servers/groupwise/e-gw-item.c.orig Tue Jan 25 20:31:45 2005 ++++ servers/groupwise/e-gw-item.c Tue Jan 25 20:32:28 2005 +@@ -2604,8 +2604,8 @@ + + /*attachments*/ + if (priv->attach_list) { +- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + GSList *al ; ++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + for (al = priv->attach_list ; al != NULL ; al = al->next) { + EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; + add_attachment_to_soap_message (attachment, msg) ; +@@ -2669,8 +2669,8 @@ + + /*attachments*/ + if (priv->attach_list) { +- soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + GSList *al ; ++ soup_soap_message_start_element (msg, "attachments", NULL, NULL) ; + for (al = priv->attach_list ; al != NULL ; al = al->next) { + EGwItemAttachment *attachment = (EGwItemAttachment *)al->data ; + add_attachment_to_soap_message (attachment, msg) ; diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist index 39bfa12d14fc..fdb7596355ec 100644 --- a/databases/evolution-data-server/pkg-plist +++ b/databases/evolution-data-server/pkg-plist @@ -1,8 +1,119 @@ +include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h +include/evolution-data-server-%%VERSION%%/camel/camel-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-arg.h +include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h +include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h +include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h +include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h +include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h +include/evolution-data-server-%%VERSION%%/camel/camel-debug.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def +include/evolution-data-server-%%VERSION%%/camel/camel-exception.h +include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h +include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-search.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h +include/evolution-data-server-%%VERSION%%/camel/camel-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h +include/evolution-data-server-%%VERSION%%/camel/camel-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h +include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h +include/evolution-data-server-%%VERSION%%/camel/camel-lock.h +include/evolution-data-server-%%VERSION%%/camel/camel-nntp-address.h +include/evolution-data-server-%%VERSION%%/camel/camel-medium.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-charset.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-crlf.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-enriched.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-from.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-yenc.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-message.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-parser.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h +include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h +include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h +include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-object.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-journal.h +include/evolution-data-server-%%VERSION%%/camel/camel-offline-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-operation.h +include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h +include/evolution-data-server-%%VERSION%%/camel/camel-provider.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h +include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h +include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h +include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h +include/evolution-data-server-%%VERSION%%/camel/camel-service.h +include/evolution-data-server-%%VERSION%%/camel/camel-session.h +include/evolution-data-server-%%VERSION%%/camel/camel-smime-context.h +include/evolution-data-server-%%VERSION%%/camel/camel-store-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-buffer.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-filter.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h +include/evolution-data-server-%%VERSION%%/camel/camel-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h +include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h +include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h +include/evolution-data-server-%%VERSION%%/camel/camel-transport.h +include/evolution-data-server-%%VERSION%%/camel/camel-types.h +include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h +include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h +include/evolution-data-server-%%VERSION%%/camel/camel-url.h +include/evolution-data-server-%%VERSION%%/camel/camel-utf8.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h +include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h +include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h +include/evolution-data-server-%%VERSION%%/camel/camel.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-item.h include/evolution-data-server-%%VERSION%%/groupwise/e-gw-message.h +include/evolution-data-server-%%VERSION%%/groupwise/e-gw-sendoptions.h include/evolution-data-server-%%VERSION%%/libebook/Evolution-DataServer-Addressbook.h include/evolution-data-server-%%VERSION%%/libebook/e-address-western.h include/evolution-data-server-%%VERSION%%/libebook/e-book-listener.h @@ -12,6 +123,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h include/evolution-data-server-%%VERSION%%/libebook/e-book.h include/evolution-data-server-%%VERSION%%/libebook/e-contact.h +include/evolution-data-server-%%VERSION%%/libebook/e-destination.h include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h @@ -26,6 +138,8 @@ include/evolution-data-server-%%VERSION%%/libecal/e-cal-view-listener.h include/evolution-data-server-%%VERSION%%/libecal/e-cal-view.h include/evolution-data-server-%%VERSION%%/libecal/e-cal.h include/evolution-data-server-%%VERSION%%/libedata-book/Evolution-DataServer-Addressbook.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-cache.h +include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-factory.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-summary.h include/evolution-data-server-%%VERSION%%/libedata-book/e-book-backend-sync.h @@ -36,6 +150,7 @@ include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book-view.h include/evolution-data-server-%%VERSION%%/libedata-book/e-data-book.h include/evolution-data-server-%%VERSION%%/libedata-cal/Evolution-DataServer-Calendar.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-cache.h +include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-factory.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sexp.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-sync.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-cal-backend-util.h @@ -46,23 +161,42 @@ include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal-view.h include/evolution-data-server-%%VERSION%%/libedata-cal/e-data-cal.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-account.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-categories.h include/evolution-data-server-%%VERSION%%/libedataserver/e-component-listener.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h +include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-book-auth-util.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-categories-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-passwords.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h +include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h include/evolution-data-server-%%VERSION%%/libical/ical.h include/evolution-data-server-%%VERSION%%/libical/icalarray.h include/evolution-data-server-%%VERSION%%/libical/icalattach.h @@ -107,32 +241,71 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h include/evolution-data-server-%%VERSION%%/libical/vcc.h include/evolution-data-server-%%VERSION%%/libical/vobject.h -lib/libebook.a -lib/libebook.so -lib/libebook.so.8 -lib/libecal.a -lib/libecal.so -lib/libecal.so.9 -lib/libedata-book.a -lib/libedata-book.so -lib/libedata-book.so.1 -lib/libedata-cal.a -lib/libedata-cal.so -lib/libedata-cal.so.6 -lib/libedataserver.a -lib/libedataserver.so -lib/libedataserver.so.5 -lib/libegroupwise.a -lib/libegroupwise.so -lib/libegroupwise.so.7 +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so +lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendldap.so +lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendvcf.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendcontacts.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendfile.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so +lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendweather.so +lib/libcamel-%%VERSION%%.a +lib/libcamel-%%VERSION%%.so +lib/libcamel-%%VERSION%%.so.0 +lib/libcamel-provider-%%VERSION%%.a +lib/libcamel-provider-%%VERSION%%.so +lib/libcamel-provider-%%VERSION%%.so.4 +lib/libebook-%%VERSION%%.a +lib/libebook-%%VERSION%%.so +lib/libebook-%%VERSION%%.so.4 +lib/libecal-%%VERSION%%.a +lib/libecal-%%VERSION%%.so +lib/libecal-%%VERSION%%.so.2 +lib/libedata-book-%%VERSION%%.a +lib/libedata-book-%%VERSION%%.so +lib/libedata-book-%%VERSION%%.so.2 +lib/libedata-cal-%%VERSION%%.a +lib/libedata-cal-%%VERSION%%.so +lib/libedata-cal-%%VERSION%%.so.3 +lib/libedataserver-%%VERSION%%.a +lib/libedataserver-%%VERSION%%.so +lib/libedataserver-%%VERSION%%.so.4 +lib/libedataserverui-%%VERSION%%.a +lib/libedataserverui-%%VERSION%%.so +lib/libedataserverui-%%VERSION%%.so.5 +lib/libegroupwise-%%VERSION%%.a +lib/libegroupwise-%%VERSION%%.so +lib/libegroupwise-%%VERSION%%.so.5 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server +libdata/pkgconfig/camel-%%VERSION%%.pc +libdata/pkgconfig/camel-provider-%%VERSION%%.pc libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc libdata/pkgconfig/libebook-%%VERSION%%.pc libdata/pkgconfig/libecal-%%VERSION%%.pc libdata/pkgconfig/libedata-book-%%VERSION%%.pc libdata/pkgconfig/libedata-cal-%%VERSION%%.pc libdata/pkgconfig/libedataserver-%%VERSION%%.pc +libdata/pkgconfig/libedataserverui-%%VERSION%%.pc libdata/pkgconfig/libegroupwise-%%VERSION%%.pc +libexec/camel-index-control-%%VERSION%% +libexec/camel-lock-helper-%%VERSION%% libexec/evolution-data-server-%%VERSION%% share/doc/libebook/EBook.html share/doc/libebook/EBookListener.html @@ -172,7 +345,10 @@ share/doc/libecal/libecal.devhelp share/doc/libecal/right.png share/doc/libecal/style.css share/doc/libecal/up.png -%%LDAP%%share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema +share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema +share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade +share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade +share/gnome/evolution-data-server-%%VERSION%%/weather/Locations.xml share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics @@ -555,12 +731,31 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Addressbook.idl share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer-Calendar.idl share/gnome/idl/evolution-data-server-%%VERSION%%/Evolution-DataServer.idl +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png +share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png share/locale/am/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ar/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/bn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/bs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/cy/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @@ -579,14 +774,19 @@ share/locale/fr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ga/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/gl/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/gu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/he/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/hi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/hr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/hu/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/id/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/is/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/mk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/ml/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/mn/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/nb/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @@ -608,8 +808,10 @@ share/locale/sv/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/tr/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/uk/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/vi/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +share/locale/wa/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo +@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%% @dirrm share/gnome/idl/evolution-data-server-%%VERSION%% @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian @@ -625,14 +827,21 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo +@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather +@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade @dirrm share/gnome/evolution-data-server-%%VERSION%% @dirrm share/doc/libecal @dirrm share/doc/libebook +@dirrm lib/evolution-data-server-%%VERSION%%/extensions +@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers +@dirrm lib/evolution-data-server-%%VERSION%% @dirrm include/evolution-data-server-%%VERSION%%/libical +@dirrm include/evolution-data-server-%%VERSION%%/libedataserverui @dirrm include/evolution-data-server-%%VERSION%%/libedataserver @dirrm include/evolution-data-server-%%VERSION%%/libedata-cal @dirrm include/evolution-data-server-%%VERSION%%/libedata-book @dirrm include/evolution-data-server-%%VERSION%%/libecal @dirrm include/evolution-data-server-%%VERSION%%/libebook @dirrm include/evolution-data-server-%%VERSION%%/groupwise +@dirrm include/evolution-data-server-%%VERSION%%/camel @dirrm include/evolution-data-server-%%VERSION%% diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile index 9028bea115c0..6045013e614a 100644 --- a/databases/libgda2/Makefile +++ b/databases/libgda2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt +USE_GNOME= gnomeprefix gnomehack glib20 libxslt INSTALLS_OMF= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes +CONFIGURE_ARGS= --without-bdb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" @@ -47,10 +47,6 @@ post-patch: WITH_MYSQL= yes .endif -.if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_PGSQL= yes -.endif - .if exists(${LOCALBASE}/lib/libldap.so.2) WITH_LDAP=yes .endif @@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-firebird +CONFIGURE_ARGS+= --without-interbase PLIST_SUB+= FIREBIRD:="@comment " .endif @@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment " .endif .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} PLIST_SUB+= SQLITE:="" .else @@ -164,9 +160,6 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_PGSQL) - @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." -.endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo index c0592ec3808a..d03935fd78c2 100644 --- a/databases/libgda2/distinfo +++ b/databases/libgda2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d -SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201 +MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017 +SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001 diff --git a/databases/libgda2/files/patch-doc::libgda-C.omf.in b/databases/libgda2/files/patch-doc::libgda-C.omf.in index cc83c742bedd..f98b540c5562 100644 --- a/databases/libgda2/files/patch-doc::libgda-C.omf.in +++ b/databases/libgda2/files/patch-doc::libgda-C.omf.in @@ -1,11 +1,11 @@ ---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003 -+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003 +--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005 ++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005 @@ -16,7 +16,7 @@ </description> <type>user's guide</type> <format mime="text/html"/> -- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/> -+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/> +- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/> ++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/> <language code="C"/> <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/> <rights type="GNU FDL" license.version="1.1"/> diff --git a/databases/libgda2/files/patch-doc_C_Makefile.in b/databases/libgda2/files/patch-doc_C_Makefile.in index 718a4a1ebe6f..ef37c3190b54 100644 --- a/databases/libgda2/files/patch-doc_C_Makefile.in +++ b/databases/libgda2/files/patch-doc_C_Makefile.in @@ -1,11 +1,11 @@ ---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002 -+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002 -@@ -152,7 +152,7 @@ - cxxflags_set = @cxxflags_set@ - - DOC_MODULE = libgda +--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004 ++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004 +@@ -116,7 +116,7 @@ + HISTORY_LIB = @HISTORY_LIB@ + HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@ + HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@ -HTML_DIR = $(datadir)/gtk-doc/html +HTML_DIR = $(prefix)/share/doc - - # The top-level SGML file. Change it if you want. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml + IBMDB2_CFLAGS = @IBMDB2_CFLAGS@ + IBMDB2_FALSE = @IBMDB2_FALSE@ + IBMDB2_LIBS = @IBMDB2_LIBS@ diff --git a/databases/libgda2/files/patch-libgda_gda-util.c b/databases/libgda2/files/patch-libgda_gda-util.c deleted file mode 100644 index 61a7cded1fdb..000000000000 --- a/databases/libgda2/files/patch-libgda_gda-util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004 -+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004 -@@ -60,7 +60,7 @@ - case GDA_VALUE_TYPE_TIME : return "time"; - case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp"; - case GDA_VALUE_TYPE_TINYINT : return "tinyint"; -- default: -+ default: ; - } - - return "string"; diff --git a/databases/libgda2/files/patch-ltmain.sh b/databases/libgda2/files/patch-ltmain.sh deleted file mode 100644 index 860ddda642f7..000000000000 --- a/databases/libgda2/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Aug 5 18:08:30 2003 -+++ ltmain.sh Wed Aug 6 08:18:27 2003 -@@ -1278,7 +1278,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1288,8 +1288,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 - ;; - -@@ -3008,6 +3016,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5457,10 +5468,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/libgda2/files/patch-po_Makefile.in.in b/databases/libgda2/files/patch-po_Makefile.in.in new file mode 100644 index 000000000000..1e6984b6bbca --- /dev/null +++ b/databases/libgda2/files/patch-po_Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004 ++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c deleted file mode 100644 index 182c120967dc..000000000000 --- a/databases/libgda2/files/patch-providers_ldap_gda-ldap-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004 -+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004 -@@ -275,7 +275,7 @@ - switch (feature) { - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -466,7 +466,7 @@ - return get_ldap_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_ldap_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c deleted file mode 100644 index a56a2df2a1a0..000000000000 --- a/databases/libgda2/files/patch-providers_mdb_gda-mdb-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004 -+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004 -@@ -389,7 +389,7 @@ - g_strfreev (arr); - } - break; -- default : -+ default : ; - } - - return reclist; -@@ -438,7 +438,7 @@ - case GDA_CONNECTION_FEATURE_PROCEDURES : - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c deleted file mode 100644 index 4b13d3f74cb5..000000000000 --- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-provider.c +++ /dev/null @@ -1,30 +0,0 @@ ---- patch-providers_mysql_gda-mysql-provider.c begins here --- ---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004 -+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004 -@@ -510,7 +510,7 @@ - - g_free (str); - break; -- default: -+ default: ; - } - - return reclist; -@@ -655,7 +655,7 @@ - case GDA_CONNECTION_FEATURE_SQL : - case GDA_CONNECTION_FEATURE_TRANSACTIONS : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -1187,7 +1187,7 @@ - return get_mysql_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_mysql_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c index 758d31ca4869..b0d7ad4862b1 100644 --- a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c +++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c @@ -1,11 +1,13 @@ ---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003 -+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003 -@@ -102,7 +102,7 @@ - break; - case FIELD_TYPE_LONGLONG : - case FIELD_TYPE_INT24 : -- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0); -+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0); - break; - case FIELD_TYPE_SHORT : - gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0); +--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004 ++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004 +@@ -67,8 +67,8 @@ + case FIELD_TYPE_LONGLONG : + case FIELD_TYPE_INT24 : + if (is_unsigned) +- gda_value_set_biguint (gda_value, atoll (value)); +- gda_value_set_bigint (gda_value, atoll (value)); ++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10)); ++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10)); + break; + case FIELD_TYPE_SHORT : + if (is_unsigned) diff --git a/databases/libgda2/files/patch-providers_oracle_utils.c b/databases/libgda2/files/patch-providers_oracle_utils.c deleted file mode 100644 index a38974770e24..000000000000 --- a/databases/libgda2/files/patch-providers_oracle_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004 -+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004 -@@ -110,7 +110,7 @@ - break; - case OCI_HTYPE_ENV: - gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line)); -- default: -+ default: ; - } - break; - default: diff --git a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c deleted file mode 100644 index 66454f222810..000000000000 --- a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004 -+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004 -@@ -623,7 +623,7 @@ - case GDA_CONNECTION_FEATURE_TRIGGERS : - case GDA_CONNECTION_FEATURE_VIEWS : - return TRUE; -- default: -+ default: ; - } - - return FALSE; -@@ -809,7 +809,7 @@ - return get_tables (cnc); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (); -- default: -+ default: ; - } - - return NULL; diff --git a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c deleted file mode 100644 index 487d19514fc6..000000000000 --- a/databases/libgda2/files/patch-providers_xml_gda-xml-provider.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004 -+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004 -@@ -681,7 +681,7 @@ - return get_tables (cnc, xmldb); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (cnc); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist index 47a454eadc30..b2da31b8cbaa 100644 --- a/databases/libgda2/pkg-plist +++ b/databases/libgda2/pkg-plist @@ -2,79 +2,79 @@ 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-result.h -include/libgda-report/gda-report-types.h -include/libgda-report/gda-report-valid.h -include/libgda-report/gda-report.h -include/libgda/gda-blob.h -include/libgda/gda-client.h -include/libgda/gda-command.h -include/libgda/gda-config.h -include/libgda/gda-connection.h -include/libgda/gda-data-model-array.h -include/libgda/gda-data-model-hash.h -include/libgda/gda-data-model-list.h -include/libgda/gda-data-model.h -include/libgda/gda-enum-types.h -include/libgda/gda-error.h -include/libgda/gda-export.h -include/libgda/gda-field.h -include/libgda/gda-log.h -include/libgda/gda-marshal.h -include/libgda/gda-parameter.h -include/libgda/gda-quark-list.h -include/libgda/gda-row.h -include/libgda/gda-select.h -include/libgda/gda-server-provider.h -include/libgda/gda-table.h -include/libgda/gda-transaction.h -include/libgda/gda-util.h -include/libgda/gda-value.h -include/libgda/gda-xml-connection.h -include/libgda/gda-xml-database.h -include/libgda/gda-xml-document.h -include/libgda/gda-xql-atom.h -include/libgda/gda-xql-bin.h -include/libgda/gda-xql-column.h -include/libgda/gda-xql-const.h -include/libgda/gda-xql-delete.h -include/libgda/gda-xql-dml.h -include/libgda/gda-xql-dual.h -include/libgda/gda-xql-field.h -include/libgda/gda-xql-func.h -include/libgda/gda-xql-insert.h -include/libgda/gda-xql-item.h -include/libgda/gda-xql-join.h -include/libgda/gda-xql-list.h -include/libgda/gda-xql-query.h -include/libgda/gda-xql-select.h -include/libgda/gda-xql-stack.h -include/libgda/gda-xql-target.h -include/libgda/gda-xql-update.h -include/libgda/gda-xql-utils.h -include/libgda/gda-xql-value.h -include/libgda/gda-xql-valueref.h -include/libgda/libgda.h +include/libgda-1.2/libgda-report/gda-report-document.h +include/libgda-1.2/libgda-report/gda-report-item-detail.h +include/libgda-1.2/libgda-report/gda-report-item-label.h +include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h +include/libgda-1.2/libgda-report/gda-report-item-pageheader.h +include/libgda-1.2/libgda-report/gda-report-item-repfield.h +include/libgda-1.2/libgda-report/gda-report-item-report.h +include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h +include/libgda-1.2/libgda-report/gda-report-item-reportheader.h +include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h +include/libgda-1.2/libgda-report/gda-report-item.h +include/libgda-1.2/libgda-report/gda-report-result.h +include/libgda-1.2/libgda-report/gda-report-types.h +include/libgda-1.2/libgda-report/gda-report-valid.h +include/libgda-1.2/libgda-report/gda-report.h +include/libgda-1.2/libgda/gda-blob.h +include/libgda-1.2/libgda/gda-client.h +include/libgda-1.2/libgda/gda-command.h +include/libgda-1.2/libgda/gda-config.h +include/libgda-1.2/libgda/gda-connection.h +include/libgda-1.2/libgda/gda-data-model-array.h +include/libgda-1.2/libgda/gda-data-model-hash.h +include/libgda-1.2/libgda/gda-data-model-list.h +include/libgda-1.2/libgda/gda-data-model.h +include/libgda-1.2/libgda/gda-enum-types.h +include/libgda-1.2/libgda/gda-error.h +include/libgda-1.2/libgda/gda-field.h +include/libgda-1.2/libgda/gda-log.h +include/libgda-1.2/libgda/gda-marshal.h +include/libgda-1.2/libgda/gda-parameter.h +include/libgda-1.2/libgda/gda-quark-list.h +include/libgda-1.2/libgda/gda-row.h +include/libgda-1.2/libgda/gda-select.h +include/libgda-1.2/libgda/gda-server-provider.h +include/libgda-1.2/libgda/gda-table.h +include/libgda-1.2/libgda/gda-transaction.h +include/libgda-1.2/libgda/gda-util.h +include/libgda-1.2/libgda/gda-value.h +include/libgda-1.2/libgda/gda-xml-connection.h +include/libgda-1.2/libgda/gda-xml-database.h +include/libgda-1.2/libgda/gda-xml-document.h +include/libgda-1.2/libgda/gda-xql-atom.h +include/libgda-1.2/libgda/gda-xql-bin.h +include/libgda-1.2/libgda/gda-xql-column.h +include/libgda-1.2/libgda/gda-xql-const.h +include/libgda-1.2/libgda/gda-xql-delete.h +include/libgda-1.2/libgda/gda-xql-dml.h +include/libgda-1.2/libgda/gda-xql-dual.h +include/libgda-1.2/libgda/gda-xql-field.h +include/libgda-1.2/libgda/gda-xql-func.h +include/libgda-1.2/libgda/gda-xql-insert.h +include/libgda-1.2/libgda/gda-xql-item.h +include/libgda-1.2/libgda/gda-xql-join.h +include/libgda-1.2/libgda/gda-xql-list.h +include/libgda-1.2/libgda/gda-xql-query.h +include/libgda-1.2/libgda/gda-xql-select.h +include/libgda-1.2/libgda/gda-xql-stack.h +include/libgda-1.2/libgda/gda-xql-target.h +include/libgda-1.2/libgda/gda-xql-update.h +include/libgda-1.2/libgda/gda-xql-utils.h +include/libgda-1.2/libgda/gda-xql-value.h +include/libgda-1.2/libgda/gda-xql-valueref.h +include/libgda-1.2/libgda/libgda.h +include/libgda-1.2/sql/sql_parser.h lib/libgda-2.a lib/libgda-2.so -lib/libgda-2.so.2 +lib/libgda-2.so.3 lib/libgda-report-2.a lib/libgda-report-2.so -lib/libgda-report-2.so.2 +lib/libgda-report-2.so.3 lib/libgdasql.a lib/libgdasql.so -lib/libgdasql.so.0 +lib/libgdasql.so.3 %%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so %%FREETDS:%%lib/libgda/providers/libgda-freetds.so %%LDAP:%%lib/libgda/providers/libgda-ldap.so @@ -87,7 +87,10 @@ lib/libgdasql.so.0 lib/libgda/providers/libgda-xml.so libdata/pkgconfig/libgda.pc %%DOCSDIR%%/architecture.html -%%DOCSDIR%%/c694.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch09s04.html +%%DOCSDIR%%/ch09s05.html +%%DOCSDIR%%/ch09s06.html %%DOCSDIR%%/compiling.html %%DOCSDIR%%/connecting.html %%DOCSDIR%%/connections.html @@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/fdl-section9.html %%DOCSDIR%%/fdl-using.html %%DOCSDIR%%/fdl.html -%%DOCSDIR%%/gdavalue.html +%%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/installation-configuring.html %%DOCSDIR%%/installation-installing.html %%DOCSDIR%%/installation.html %%DOCSDIR%%/introduction.html +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgda.devhelp +%%DOCSDIR%%/libgda-GdaClient.html +%%DOCSDIR%%/libgda-GdaConnection.html +%%DOCSDIR%%/libgda-GdaDataModel.html +%%DOCSDIR%%/libgda-GdaDataModelArray.html +%%DOCSDIR%%/libgda-GdaDataModelHash.html +%%DOCSDIR%%/libgda-GdaDataModelList.html +%%DOCSDIR%%/libgda-GdaError.html +%%DOCSDIR%%/libgda-GdaExport.html +%%DOCSDIR%%/libgda-GdaReportDocument.html +%%DOCSDIR%%/libgda-GdaReportItem.html +%%DOCSDIR%%/libgda-GdaReportItemDetail.html +%%DOCSDIR%%/libgda-GdaReportItemLabel.html +%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html +%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html +%%DOCSDIR%%/libgda-GdaReportItemRepField.html +%%DOCSDIR%%/libgda-GdaReportItemReport.html +%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html +%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html +%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html +%%DOCSDIR%%/libgda-GdaReportResult.html +%%DOCSDIR%%/libgda-GdaReportValid.html +%%DOCSDIR%%/libgda-GdaSelect.html +%%DOCSDIR%%/libgda-GdaServerProvider.html +%%DOCSDIR%%/libgda-GdaTable.html +%%DOCSDIR%%/libgda-GdaTransaction.html +%%DOCSDIR%%/libgda-GdaXmlConnection.html +%%DOCSDIR%%/libgda-GdaXmlDatabase.html +%%DOCSDIR%%/libgda-GdaXmlDocument.html +%%DOCSDIR%%/libgda-GdaXqlAtom.html +%%DOCSDIR%%/libgda-GdaXqlBin.html +%%DOCSDIR%%/libgda-GdaXqlColumn.html +%%DOCSDIR%%/libgda-GdaXqlConst.html +%%DOCSDIR%%/libgda-GdaXqlDelete.html +%%DOCSDIR%%/libgda-GdaXqlDml.html +%%DOCSDIR%%/libgda-GdaXqlDual.html +%%DOCSDIR%%/libgda-GdaXqlField.html +%%DOCSDIR%%/libgda-GdaXqlFunc.html +%%DOCSDIR%%/libgda-GdaXqlInsert.html +%%DOCSDIR%%/libgda-GdaXqlItem.html +%%DOCSDIR%%/libgda-GdaXqlJoin.html +%%DOCSDIR%%/libgda-GdaXqlList.html +%%DOCSDIR%%/libgda-GdaXqlQuery.html +%%DOCSDIR%%/libgda-GdaXqlSelect.html +%%DOCSDIR%%/libgda-GdaXqlStack.html +%%DOCSDIR%%/libgda-GdaXqlTarget.html +%%DOCSDIR%%/libgda-GdaXqlUpdate.html +%%DOCSDIR%%/libgda-GdaXqlValue.html +%%DOCSDIR%%/libgda-GdaXqlValueRef.html %%DOCSDIR%%/libgda-api.html %%DOCSDIR%%/libgda-gda-blob.html %%DOCSDIR%%/libgda-gda-command.html @@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/libgda-gda-util.html %%DOCSDIR%%/libgda-gda-value.html %%DOCSDIR%%/libgda-gda-xql-utils.html -%%DOCSDIR%%/libgda-gdaclient.html -%%DOCSDIR%%/libgda-gdaconnection.html -%%DOCSDIR%%/libgda-gdadatamodel.html -%%DOCSDIR%%/libgda-gdadatamodelarray.html -%%DOCSDIR%%/libgda-gdadatamodelhash.html -%%DOCSDIR%%/libgda-gdadatamodellist.html -%%DOCSDIR%%/libgda-gdaerror.html -%%DOCSDIR%%/libgda-gdaexport.html -%%DOCSDIR%%/libgda-gdareportdocument.html -%%DOCSDIR%%/libgda-gdareportitem.html -%%DOCSDIR%%/libgda-gdareportitemdetail.html -%%DOCSDIR%%/libgda-gdareportitemlabel.html -%%DOCSDIR%%/libgda-gdareportitempagefooter.html -%%DOCSDIR%%/libgda-gdareportitempageheader.html -%%DOCSDIR%%/libgda-gdareportitemrepfield.html -%%DOCSDIR%%/libgda-gdareportitemreport.html -%%DOCSDIR%%/libgda-gdareportitemreportfooter.html -%%DOCSDIR%%/libgda-gdareportitemreportheader.html -%%DOCSDIR%%/libgda-gdareportitemsqlquery.html -%%DOCSDIR%%/libgda-gdareportresult.html -%%DOCSDIR%%/libgda-gdareportvalid.html -%%DOCSDIR%%/libgda-gdaselect.html -%%DOCSDIR%%/libgda-gdaserverprovider.html -%%DOCSDIR%%/libgda-gdatable.html -%%DOCSDIR%%/libgda-gdatransaction.html -%%DOCSDIR%%/libgda-gdaxmlconnection.html -%%DOCSDIR%%/libgda-gdaxmldatabase.html -%%DOCSDIR%%/libgda-gdaxmldocument.html -%%DOCSDIR%%/libgda-gdaxqlatom.html -%%DOCSDIR%%/libgda-gdaxqlbin.html -%%DOCSDIR%%/libgda-gdaxqlcolumn.html -%%DOCSDIR%%/libgda-gdaxqlconst.html -%%DOCSDIR%%/libgda-gdaxqldelete.html -%%DOCSDIR%%/libgda-gdaxqldml.html -%%DOCSDIR%%/libgda-gdaxqldual.html -%%DOCSDIR%%/libgda-gdaxqlfield.html -%%DOCSDIR%%/libgda-gdaxqlfunc.html -%%DOCSDIR%%/libgda-gdaxqlinsert.html -%%DOCSDIR%%/libgda-gdaxqlitem.html -%%DOCSDIR%%/libgda-gdaxqljoin.html -%%DOCSDIR%%/libgda-gdaxqllist.html -%%DOCSDIR%%/libgda-gdaxqlquery.html -%%DOCSDIR%%/libgda-gdaxqlselect.html -%%DOCSDIR%%/libgda-gdaxqlstack.html -%%DOCSDIR%%/libgda-gdaxqltarget.html -%%DOCSDIR%%/libgda-gdaxqlupdate.html -%%DOCSDIR%%/libgda-gdaxqlvalue.html -%%DOCSDIR%%/libgda-gdaxqlvalueref.html %%DOCSDIR%%/libgda-libgda.html %%DOCSDIR%%/libgda-provider-class.html %%DOCSDIR%%/libgda-provider-recordset.html %%DOCSDIR%%/libgda-providers.html %%DOCSDIR%%/libgda-reports.html +%%DOCSDIR%%/libgda-server-provider-details.html %%DOCSDIR%%/libgda-xql.html %%DOCSDIR%%/main_example.html +%%DOCSDIR%%/manage-gdavalue.html %%DOCSDIR%%/managing-errors.html %%DOCSDIR%%/migration-configuration.html %%DOCSDIR%%/migration-executing-commands.html %%DOCSDIR%%/migration.html %%DOCSDIR%%/processing-queries.html -%%DOCSDIR%%/x863.html -%%DOCSDIR%%/x892.html -%%DOCSDIR%%/x897.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/libgda/xml/gda-report.dtd share/gnome/libgda/xml/gda-report-result.dtd share/gnome/libgda/xml/gda-xml-query.dtd @@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo share/locale/gl/LC_MESSAGES/libgda-2.mo share/locale/hr/LC_MESSAGES/libgda-2.mo share/locale/hu/LC_MESSAGES/libgda-2.mo -share/locale/id/LC_MESSAGES/libgda-2.mo share/locale/it/LC_MESSAGES/libgda-2.mo share/locale/ja/LC_MESSAGES/libgda-2.mo share/locale/ko/LC_MESSAGES/libgda-2.mo share/locale/ml/LC_MESSAGES/libgda-2.mo share/locale/ms/LC_MESSAGES/libgda-2.mo +share/locale/nb/LC_MESSAGES/libgda-2.mo share/locale/nl/LC_MESSAGES/libgda-2.mo share/locale/no/LC_MESSAGES/libgda-2.mo share/locale/pl/LC_MESSAGES/libgda-2.mo @@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo share/locale/ru/LC_MESSAGES/libgda-2.mo share/locale/sk/LC_MESSAGES/libgda-2.mo share/locale/sl/LC_MESSAGES/libgda-2.mo +share/locale/sq/LC_MESSAGES/libgda-2.mo share/locale/sr/LC_MESSAGES/libgda-2.mo share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo share/locale/sv/LC_MESSAGES/libgda-2.mo @@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/libgda @dirrm lib/libgda/providers @dirrm lib/libgda -@dirrm include/libgda/sql -@dirrm include/libgda -@dirrm include/libgda-report +@dirrm include/libgda-1.2/sql +@dirrm include/libgda-1.2/libgda-report +@dirrm include/libgda-1.2/libgda +@dirrm include/libgda-1.2 @dirrm etc/libgda diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 9028bea115c0..6045013e614a 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgda2 -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/1.2 DISTNAME= libgda-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,11 +23,12 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier glib20 libxslt +USE_GNOME= gnomeprefix gnomehack glib20 libxslt INSTALLS_OMF= yes INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes +USE_LIBTOOL_VER=15 USE_REINPLACE= yes +CONFIGURE_ARGS= --without-bdb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lintl" @@ -47,10 +47,6 @@ post-patch: WITH_MYSQL= yes .endif -.if exists(${LOCALBASE}/lib/libpq.so.3) -WITH_PGSQL= yes -.endif - .if exists(${LOCALBASE}/lib/libldap.so.2) WITH_LDAP=yes .endif @@ -111,7 +107,7 @@ LIB_DEPENDS+= gds.1:${PORTSDIR}/databases/firebird CONFIGURE_ARGS+= --with-firebird=${LOCALBASE}/firebird PLIST_SUB+= FIREBIRD:="" .else -CONFIGURE_ARGS+= --without-firebird +CONFIGURE_ARGS+= --without-interbase PLIST_SUB+= FIREBIRD:="@comment " .endif @@ -152,7 +148,7 @@ PLIST_SUB+= ODBC:="@comment " .endif .if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE) -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite2 +LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-sqlite=${LOCALBASE} PLIST_SUB+= SQLITE:="" .else @@ -164,9 +160,6 @@ pre-everything:: .if !defined(WITH_MYSQL) @${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL." .endif -.if !defined(WITH_PGSQL) - @${ECHO_MSG} "You can enable support for PostgreSQL databases by defining WITH_PGSQL." -.endif .if !defined(WITH_LDAP) @${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP." .endif diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo index c0592ec3808a..d03935fd78c2 100644 --- a/databases/libgda3/distinfo +++ b/databases/libgda3/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgda-1.0.4.tar.bz2) = c13d884dc61a3819c91422880147864d -SIZE (gnome2/libgda-1.0.4.tar.bz2) = 1112201 +MD5 (gnome2/libgda-1.2.1.tar.bz2) = 513a3b7adb66fa5641bae5394f60c017 +SIZE (gnome2/libgda-1.2.1.tar.bz2) = 1223001 diff --git a/databases/libgda3/files/patch-doc::libgda-C.omf.in b/databases/libgda3/files/patch-doc::libgda-C.omf.in index cc83c742bedd..f98b540c5562 100644 --- a/databases/libgda3/files/patch-doc::libgda-C.omf.in +++ b/databases/libgda3/files/patch-doc::libgda-C.omf.in @@ -1,11 +1,11 @@ ---- doc/libgda-C.omf.in.orig Thu Oct 2 11:54:08 2003 -+++ doc/libgda-C.omf.in Thu Oct 2 11:54:58 2003 +--- doc/libgda-C.omf.in.orig Mon Feb 28 05:30:59 2005 ++++ doc/libgda-C.omf.in Thu Mar 3 14:07:24 2005 @@ -16,7 +16,7 @@ </description> <type>user's guide</type> <format mime="text/html"/> -- <identifier url="file:/@prefix@/share/gtk-doc/html/libgda/index.html"/> -+ <identifier url="file:/@prefix@/share/doc/libgda/index.html"/> +- <identifier url="file:@prefix@/share/gtk-doc/html/libgda/index.html"/> ++ <identifier url="file:@prefix@/share/doc/libgda/index.html"/> <language code="C"/> <relation seriesid="ebe4f574-a94d-11d6-8bc3-bd1f202a92f8"/> <rights type="GNU FDL" license.version="1.1"/> diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in index 718a4a1ebe6f..ef37c3190b54 100644 --- a/databases/libgda3/files/patch-doc_C_Makefile.in +++ b/databases/libgda3/files/patch-doc_C_Makefile.in @@ -1,11 +1,11 @@ ---- doc/C/Makefile.in.orig Sun Jun 2 22:17:05 2002 -+++ doc/C/Makefile.in Sun Jun 2 22:17:27 2002 -@@ -152,7 +152,7 @@ - cxxflags_set = @cxxflags_set@ - - DOC_MODULE = libgda +--- doc/C/Makefile.in.orig Thu Jul 22 10:35:19 2004 ++++ doc/C/Makefile.in Thu Jul 22 10:35:48 2004 +@@ -116,7 +116,7 @@ + HISTORY_LIB = @HISTORY_LIB@ + HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@ + HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@ -HTML_DIR = $(datadir)/gtk-doc/html +HTML_DIR = $(prefix)/share/doc - - # The top-level SGML file. Change it if you want. - DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml + IBMDB2_CFLAGS = @IBMDB2_CFLAGS@ + IBMDB2_FALSE = @IBMDB2_FALSE@ + IBMDB2_LIBS = @IBMDB2_LIBS@ diff --git a/databases/libgda3/files/patch-libgda_gda-util.c b/databases/libgda3/files/patch-libgda_gda-util.c deleted file mode 100644 index 61a7cded1fdb..000000000000 --- a/databases/libgda3/files/patch-libgda_gda-util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgda/gda-util.c.orig Sat Jul 17 11:02:21 2004 -+++ libgda/gda-util.c Sat Jul 17 11:03:07 2004 -@@ -60,7 +60,7 @@ - case GDA_VALUE_TYPE_TIME : return "time"; - case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp"; - case GDA_VALUE_TYPE_TINYINT : return "tinyint"; -- default: -+ default: ; - } - - return "string"; diff --git a/databases/libgda3/files/patch-ltmain.sh b/databases/libgda3/files/patch-ltmain.sh deleted file mode 100644 index 860ddda642f7..000000000000 --- a/databases/libgda3/files/patch-ltmain.sh +++ /dev/null @@ -1,51 +0,0 @@ ---- ltmain.sh.orig Tue Aug 5 18:08:30 2003 -+++ ltmain.sh Wed Aug 6 08:18:27 2003 -@@ -1278,7 +1278,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -1288,8 +1288,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 - ;; - -@@ -3008,6 +3016,9 @@ - # problems, so we reset it completely - verstring= - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -5457,10 +5468,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/files/patch-po_Makefile.in.in b/databases/libgda3/files/patch-po_Makefile.in.in new file mode 100644 index 000000000000..1e6984b6bbca --- /dev/null +++ b/databases/libgda3/files/patch-po_Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Sat Aug 14 00:43:46 2004 ++++ po/Makefile.in.in Sat Aug 14 00:45:54 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c b/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c deleted file mode 100644 index 182c120967dc..000000000000 --- a/databases/libgda3/files/patch-providers_ldap_gda-ldap-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/ldap/gda-ldap-provider.c.orig Sat Jul 17 11:06:48 2004 -+++ providers/ldap/gda-ldap-provider.c Sat Jul 17 11:06:57 2004 -@@ -275,7 +275,7 @@ - switch (feature) { - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -466,7 +466,7 @@ - return get_ldap_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_ldap_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c b/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c deleted file mode 100644 index a56a2df2a1a0..000000000000 --- a/databases/libgda3/files/patch-providers_mdb_gda-mdb-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/mdb/gda-mdb-provider.c.orig Sat Jul 17 11:05:48 2004 -+++ providers/mdb/gda-mdb-provider.c Sat Jul 17 11:06:12 2004 -@@ -389,7 +389,7 @@ - g_strfreev (arr); - } - break; -- default : -+ default : ; - } - - return reclist; -@@ -438,7 +438,7 @@ - case GDA_CONNECTION_FEATURE_PROCEDURES : - case GDA_CONNECTION_FEATURE_SQL : - return TRUE; -- default : -+ default : ; - } - - return FALSE; diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c deleted file mode 100644 index 4b13d3f74cb5..000000000000 --- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-provider.c +++ /dev/null @@ -1,30 +0,0 @@ ---- patch-providers_mysql_gda-mysql-provider.c begins here --- ---- providers/mysql/gda-mysql-provider.c.orig Sat Aug 14 22:14:57 2004 -+++ providers/mysql/gda-mysql-provider.c Sat Aug 14 22:15:59 2004 -@@ -510,7 +510,7 @@ - - g_free (str); - break; -- default: -+ default: ; - } - - return reclist; -@@ -655,7 +655,7 @@ - case GDA_CONNECTION_FEATURE_SQL : - case GDA_CONNECTION_FEATURE_TRANSACTIONS : - return TRUE; -- default : -+ default : ; - } - - return FALSE; -@@ -1187,7 +1187,7 @@ - return get_mysql_tables (cnc, params); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_mysql_types (cnc, params); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c index 758d31ca4869..b0d7ad4862b1 100644 --- a/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c +++ b/databases/libgda3/files/patch-providers_mysql_gda-mysql-recordset.c @@ -1,11 +1,13 @@ ---- providers/mysql/gda-mysql-recordset.c.orig Mon Feb 17 21:42:16 2003 -+++ providers/mysql/gda-mysql-recordset.c Mon Feb 17 21:42:57 2003 -@@ -102,7 +102,7 @@ - break; - case FIELD_TYPE_LONGLONG : - case FIELD_TYPE_INT24 : -- gda_value_set_bigint (field, thevalue ? atoll (thevalue) : 0); -+ gda_value_set_bigint (field, thevalue ? strtoll(thevalue, &thevalue, 10) : 0); - break; - case FIELD_TYPE_SHORT : - gda_value_set_smallint (field, thevalue ? atoi (thevalue) : 0); +--- providers/mysql/gda-mysql-recordset.c.orig Thu Jul 22 10:40:31 2004 ++++ providers/mysql/gda-mysql-recordset.c Thu Jul 22 10:42:51 2004 +@@ -67,8 +67,8 @@ + case FIELD_TYPE_LONGLONG : + case FIELD_TYPE_INT24 : + if (is_unsigned) +- gda_value_set_biguint (gda_value, atoll (value)); +- gda_value_set_bigint (gda_value, atoll (value)); ++ gda_value_set_biguint (gda_value, strtoll (value, &value, 10)); ++ gda_value_set_bigint (gda_value, strtoll (value, &value, 10)); + break; + case FIELD_TYPE_SHORT : + if (is_unsigned) diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c deleted file mode 100644 index a38974770e24..000000000000 --- a/databases/libgda3/files/patch-providers_oracle_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/oracle/utils.c.orig Sat Jul 17 11:07:46 2004 -+++ providers/oracle/utils.c Sat Jul 17 11:08:12 2004 -@@ -110,7 +110,7 @@ - break; - case OCI_HTYPE_ENV: - gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line)); -- default: -+ default: ; - } - break; - default: diff --git a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c deleted file mode 100644 index 66454f222810..000000000000 --- a/databases/libgda3/files/patch-providers_sqlite_gda-sqlite-provider.c +++ /dev/null @@ -1,20 +0,0 @@ ---- providers/sqlite/gda-sqlite-provider.c.orig Sat Jul 17 11:09:00 2004 -+++ providers/sqlite/gda-sqlite-provider.c Sat Jul 17 11:09:07 2004 -@@ -623,7 +623,7 @@ - case GDA_CONNECTION_FEATURE_TRIGGERS : - case GDA_CONNECTION_FEATURE_VIEWS : - return TRUE; -- default: -+ default: ; - } - - return FALSE; -@@ -809,7 +809,7 @@ - return get_tables (cnc); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (); -- default: -+ default: ; - } - - return NULL; diff --git a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c b/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c deleted file mode 100644 index 487d19514fc6..000000000000 --- a/databases/libgda3/files/patch-providers_xml_gda-xml-provider.c +++ /dev/null @@ -1,11 +0,0 @@ ---- providers/xml/gda-xml-provider.c.orig Sat Jul 17 11:05:02 2004 -+++ providers/xml/gda-xml-provider.c Sat Jul 17 11:05:11 2004 -@@ -681,7 +681,7 @@ - return get_tables (cnc, xmldb); - case GDA_CONNECTION_SCHEMA_TYPES : - return get_types (cnc); -- default : -+ default : ; - } - - return NULL; diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist index 47a454eadc30..b2da31b8cbaa 100644 --- a/databases/libgda3/pkg-plist +++ b/databases/libgda3/pkg-plist @@ -2,79 +2,79 @@ 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-result.h -include/libgda-report/gda-report-types.h -include/libgda-report/gda-report-valid.h -include/libgda-report/gda-report.h -include/libgda/gda-blob.h -include/libgda/gda-client.h -include/libgda/gda-command.h -include/libgda/gda-config.h -include/libgda/gda-connection.h -include/libgda/gda-data-model-array.h -include/libgda/gda-data-model-hash.h -include/libgda/gda-data-model-list.h -include/libgda/gda-data-model.h -include/libgda/gda-enum-types.h -include/libgda/gda-error.h -include/libgda/gda-export.h -include/libgda/gda-field.h -include/libgda/gda-log.h -include/libgda/gda-marshal.h -include/libgda/gda-parameter.h -include/libgda/gda-quark-list.h -include/libgda/gda-row.h -include/libgda/gda-select.h -include/libgda/gda-server-provider.h -include/libgda/gda-table.h -include/libgda/gda-transaction.h -include/libgda/gda-util.h -include/libgda/gda-value.h -include/libgda/gda-xml-connection.h -include/libgda/gda-xml-database.h -include/libgda/gda-xml-document.h -include/libgda/gda-xql-atom.h -include/libgda/gda-xql-bin.h -include/libgda/gda-xql-column.h -include/libgda/gda-xql-const.h -include/libgda/gda-xql-delete.h -include/libgda/gda-xql-dml.h -include/libgda/gda-xql-dual.h -include/libgda/gda-xql-field.h -include/libgda/gda-xql-func.h -include/libgda/gda-xql-insert.h -include/libgda/gda-xql-item.h -include/libgda/gda-xql-join.h -include/libgda/gda-xql-list.h -include/libgda/gda-xql-query.h -include/libgda/gda-xql-select.h -include/libgda/gda-xql-stack.h -include/libgda/gda-xql-target.h -include/libgda/gda-xql-update.h -include/libgda/gda-xql-utils.h -include/libgda/gda-xql-value.h -include/libgda/gda-xql-valueref.h -include/libgda/libgda.h +include/libgda-1.2/libgda-report/gda-report-document.h +include/libgda-1.2/libgda-report/gda-report-item-detail.h +include/libgda-1.2/libgda-report/gda-report-item-label.h +include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h +include/libgda-1.2/libgda-report/gda-report-item-pageheader.h +include/libgda-1.2/libgda-report/gda-report-item-repfield.h +include/libgda-1.2/libgda-report/gda-report-item-report.h +include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h +include/libgda-1.2/libgda-report/gda-report-item-reportheader.h +include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h +include/libgda-1.2/libgda-report/gda-report-item.h +include/libgda-1.2/libgda-report/gda-report-result.h +include/libgda-1.2/libgda-report/gda-report-types.h +include/libgda-1.2/libgda-report/gda-report-valid.h +include/libgda-1.2/libgda-report/gda-report.h +include/libgda-1.2/libgda/gda-blob.h +include/libgda-1.2/libgda/gda-client.h +include/libgda-1.2/libgda/gda-command.h +include/libgda-1.2/libgda/gda-config.h +include/libgda-1.2/libgda/gda-connection.h +include/libgda-1.2/libgda/gda-data-model-array.h +include/libgda-1.2/libgda/gda-data-model-hash.h +include/libgda-1.2/libgda/gda-data-model-list.h +include/libgda-1.2/libgda/gda-data-model.h +include/libgda-1.2/libgda/gda-enum-types.h +include/libgda-1.2/libgda/gda-error.h +include/libgda-1.2/libgda/gda-field.h +include/libgda-1.2/libgda/gda-log.h +include/libgda-1.2/libgda/gda-marshal.h +include/libgda-1.2/libgda/gda-parameter.h +include/libgda-1.2/libgda/gda-quark-list.h +include/libgda-1.2/libgda/gda-row.h +include/libgda-1.2/libgda/gda-select.h +include/libgda-1.2/libgda/gda-server-provider.h +include/libgda-1.2/libgda/gda-table.h +include/libgda-1.2/libgda/gda-transaction.h +include/libgda-1.2/libgda/gda-util.h +include/libgda-1.2/libgda/gda-value.h +include/libgda-1.2/libgda/gda-xml-connection.h +include/libgda-1.2/libgda/gda-xml-database.h +include/libgda-1.2/libgda/gda-xml-document.h +include/libgda-1.2/libgda/gda-xql-atom.h +include/libgda-1.2/libgda/gda-xql-bin.h +include/libgda-1.2/libgda/gda-xql-column.h +include/libgda-1.2/libgda/gda-xql-const.h +include/libgda-1.2/libgda/gda-xql-delete.h +include/libgda-1.2/libgda/gda-xql-dml.h +include/libgda-1.2/libgda/gda-xql-dual.h +include/libgda-1.2/libgda/gda-xql-field.h +include/libgda-1.2/libgda/gda-xql-func.h +include/libgda-1.2/libgda/gda-xql-insert.h +include/libgda-1.2/libgda/gda-xql-item.h +include/libgda-1.2/libgda/gda-xql-join.h +include/libgda-1.2/libgda/gda-xql-list.h +include/libgda-1.2/libgda/gda-xql-query.h +include/libgda-1.2/libgda/gda-xql-select.h +include/libgda-1.2/libgda/gda-xql-stack.h +include/libgda-1.2/libgda/gda-xql-target.h +include/libgda-1.2/libgda/gda-xql-update.h +include/libgda-1.2/libgda/gda-xql-utils.h +include/libgda-1.2/libgda/gda-xql-value.h +include/libgda-1.2/libgda/gda-xql-valueref.h +include/libgda-1.2/libgda/libgda.h +include/libgda-1.2/sql/sql_parser.h lib/libgda-2.a lib/libgda-2.so -lib/libgda-2.so.2 +lib/libgda-2.so.3 lib/libgda-report-2.a lib/libgda-report-2.so -lib/libgda-report-2.so.2 +lib/libgda-report-2.so.3 lib/libgdasql.a lib/libgdasql.so -lib/libgdasql.so.0 +lib/libgdasql.so.3 %%FIREBIRD:%%lib/libgda/providers/libgda-firebird.so %%FREETDS:%%lib/libgda/providers/libgda-freetds.so %%LDAP:%%lib/libgda/providers/libgda-ldap.so @@ -87,7 +87,10 @@ lib/libgdasql.so.0 lib/libgda/providers/libgda-xml.so libdata/pkgconfig/libgda.pc %%DOCSDIR%%/architecture.html -%%DOCSDIR%%/c694.html +%%DOCSDIR%%/ch06.html +%%DOCSDIR%%/ch09s04.html +%%DOCSDIR%%/ch09s05.html +%%DOCSDIR%%/ch09s06.html %%DOCSDIR%%/compiling.html %%DOCSDIR%%/connecting.html %%DOCSDIR%%/connections.html @@ -104,13 +107,63 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/fdl-section9.html %%DOCSDIR%%/fdl-using.html %%DOCSDIR%%/fdl.html -%%DOCSDIR%%/gdavalue.html +%%DOCSDIR%%/home.png %%DOCSDIR%%/index.html %%DOCSDIR%%/index.sgml %%DOCSDIR%%/installation-configuring.html %%DOCSDIR%%/installation-installing.html %%DOCSDIR%%/installation.html %%DOCSDIR%%/introduction.html +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgda.devhelp +%%DOCSDIR%%/libgda-GdaClient.html +%%DOCSDIR%%/libgda-GdaConnection.html +%%DOCSDIR%%/libgda-GdaDataModel.html +%%DOCSDIR%%/libgda-GdaDataModelArray.html +%%DOCSDIR%%/libgda-GdaDataModelHash.html +%%DOCSDIR%%/libgda-GdaDataModelList.html +%%DOCSDIR%%/libgda-GdaError.html +%%DOCSDIR%%/libgda-GdaExport.html +%%DOCSDIR%%/libgda-GdaReportDocument.html +%%DOCSDIR%%/libgda-GdaReportItem.html +%%DOCSDIR%%/libgda-GdaReportItemDetail.html +%%DOCSDIR%%/libgda-GdaReportItemLabel.html +%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html +%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html +%%DOCSDIR%%/libgda-GdaReportItemRepField.html +%%DOCSDIR%%/libgda-GdaReportItemReport.html +%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html +%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html +%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html +%%DOCSDIR%%/libgda-GdaReportResult.html +%%DOCSDIR%%/libgda-GdaReportValid.html +%%DOCSDIR%%/libgda-GdaSelect.html +%%DOCSDIR%%/libgda-GdaServerProvider.html +%%DOCSDIR%%/libgda-GdaTable.html +%%DOCSDIR%%/libgda-GdaTransaction.html +%%DOCSDIR%%/libgda-GdaXmlConnection.html +%%DOCSDIR%%/libgda-GdaXmlDatabase.html +%%DOCSDIR%%/libgda-GdaXmlDocument.html +%%DOCSDIR%%/libgda-GdaXqlAtom.html +%%DOCSDIR%%/libgda-GdaXqlBin.html +%%DOCSDIR%%/libgda-GdaXqlColumn.html +%%DOCSDIR%%/libgda-GdaXqlConst.html +%%DOCSDIR%%/libgda-GdaXqlDelete.html +%%DOCSDIR%%/libgda-GdaXqlDml.html +%%DOCSDIR%%/libgda-GdaXqlDual.html +%%DOCSDIR%%/libgda-GdaXqlField.html +%%DOCSDIR%%/libgda-GdaXqlFunc.html +%%DOCSDIR%%/libgda-GdaXqlInsert.html +%%DOCSDIR%%/libgda-GdaXqlItem.html +%%DOCSDIR%%/libgda-GdaXqlJoin.html +%%DOCSDIR%%/libgda-GdaXqlList.html +%%DOCSDIR%%/libgda-GdaXqlQuery.html +%%DOCSDIR%%/libgda-GdaXqlSelect.html +%%DOCSDIR%%/libgda-GdaXqlStack.html +%%DOCSDIR%%/libgda-GdaXqlTarget.html +%%DOCSDIR%%/libgda-GdaXqlUpdate.html +%%DOCSDIR%%/libgda-GdaXqlValue.html +%%DOCSDIR%%/libgda-GdaXqlValueRef.html %%DOCSDIR%%/libgda-api.html %%DOCSDIR%%/libgda-gda-blob.html %%DOCSDIR%%/libgda-gda-command.html @@ -124,69 +177,23 @@ libdata/pkgconfig/libgda.pc %%DOCSDIR%%/libgda-gda-util.html %%DOCSDIR%%/libgda-gda-value.html %%DOCSDIR%%/libgda-gda-xql-utils.html -%%DOCSDIR%%/libgda-gdaclient.html -%%DOCSDIR%%/libgda-gdaconnection.html -%%DOCSDIR%%/libgda-gdadatamodel.html -%%DOCSDIR%%/libgda-gdadatamodelarray.html -%%DOCSDIR%%/libgda-gdadatamodelhash.html -%%DOCSDIR%%/libgda-gdadatamodellist.html -%%DOCSDIR%%/libgda-gdaerror.html -%%DOCSDIR%%/libgda-gdaexport.html -%%DOCSDIR%%/libgda-gdareportdocument.html -%%DOCSDIR%%/libgda-gdareportitem.html -%%DOCSDIR%%/libgda-gdareportitemdetail.html -%%DOCSDIR%%/libgda-gdareportitemlabel.html -%%DOCSDIR%%/libgda-gdareportitempagefooter.html -%%DOCSDIR%%/libgda-gdareportitempageheader.html -%%DOCSDIR%%/libgda-gdareportitemrepfield.html -%%DOCSDIR%%/libgda-gdareportitemreport.html -%%DOCSDIR%%/libgda-gdareportitemreportfooter.html -%%DOCSDIR%%/libgda-gdareportitemreportheader.html -%%DOCSDIR%%/libgda-gdareportitemsqlquery.html -%%DOCSDIR%%/libgda-gdareportresult.html -%%DOCSDIR%%/libgda-gdareportvalid.html -%%DOCSDIR%%/libgda-gdaselect.html -%%DOCSDIR%%/libgda-gdaserverprovider.html -%%DOCSDIR%%/libgda-gdatable.html -%%DOCSDIR%%/libgda-gdatransaction.html -%%DOCSDIR%%/libgda-gdaxmlconnection.html -%%DOCSDIR%%/libgda-gdaxmldatabase.html -%%DOCSDIR%%/libgda-gdaxmldocument.html -%%DOCSDIR%%/libgda-gdaxqlatom.html -%%DOCSDIR%%/libgda-gdaxqlbin.html -%%DOCSDIR%%/libgda-gdaxqlcolumn.html -%%DOCSDIR%%/libgda-gdaxqlconst.html -%%DOCSDIR%%/libgda-gdaxqldelete.html -%%DOCSDIR%%/libgda-gdaxqldml.html -%%DOCSDIR%%/libgda-gdaxqldual.html -%%DOCSDIR%%/libgda-gdaxqlfield.html -%%DOCSDIR%%/libgda-gdaxqlfunc.html -%%DOCSDIR%%/libgda-gdaxqlinsert.html -%%DOCSDIR%%/libgda-gdaxqlitem.html -%%DOCSDIR%%/libgda-gdaxqljoin.html -%%DOCSDIR%%/libgda-gdaxqllist.html -%%DOCSDIR%%/libgda-gdaxqlquery.html -%%DOCSDIR%%/libgda-gdaxqlselect.html -%%DOCSDIR%%/libgda-gdaxqlstack.html -%%DOCSDIR%%/libgda-gdaxqltarget.html -%%DOCSDIR%%/libgda-gdaxqlupdate.html -%%DOCSDIR%%/libgda-gdaxqlvalue.html -%%DOCSDIR%%/libgda-gdaxqlvalueref.html %%DOCSDIR%%/libgda-libgda.html %%DOCSDIR%%/libgda-provider-class.html %%DOCSDIR%%/libgda-provider-recordset.html %%DOCSDIR%%/libgda-providers.html %%DOCSDIR%%/libgda-reports.html +%%DOCSDIR%%/libgda-server-provider-details.html %%DOCSDIR%%/libgda-xql.html %%DOCSDIR%%/main_example.html +%%DOCSDIR%%/manage-gdavalue.html %%DOCSDIR%%/managing-errors.html %%DOCSDIR%%/migration-configuration.html %%DOCSDIR%%/migration-executing-commands.html %%DOCSDIR%%/migration.html %%DOCSDIR%%/processing-queries.html -%%DOCSDIR%%/x863.html -%%DOCSDIR%%/x892.html -%%DOCSDIR%%/x897.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/libgda/xml/gda-report.dtd share/gnome/libgda/xml/gda-report-result.dtd share/gnome/libgda/xml/gda-xml-query.dtd @@ -208,12 +215,12 @@ share/locale/ga/LC_MESSAGES/libgda-2.mo share/locale/gl/LC_MESSAGES/libgda-2.mo share/locale/hr/LC_MESSAGES/libgda-2.mo share/locale/hu/LC_MESSAGES/libgda-2.mo -share/locale/id/LC_MESSAGES/libgda-2.mo share/locale/it/LC_MESSAGES/libgda-2.mo share/locale/ja/LC_MESSAGES/libgda-2.mo share/locale/ko/LC_MESSAGES/libgda-2.mo share/locale/ml/LC_MESSAGES/libgda-2.mo share/locale/ms/LC_MESSAGES/libgda-2.mo +share/locale/nb/LC_MESSAGES/libgda-2.mo share/locale/nl/LC_MESSAGES/libgda-2.mo share/locale/no/LC_MESSAGES/libgda-2.mo share/locale/pl/LC_MESSAGES/libgda-2.mo @@ -222,6 +229,7 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo share/locale/ru/LC_MESSAGES/libgda-2.mo share/locale/sk/LC_MESSAGES/libgda-2.mo share/locale/sl/LC_MESSAGES/libgda-2.mo +share/locale/sq/LC_MESSAGES/libgda-2.mo share/locale/sr/LC_MESSAGES/libgda-2.mo share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo share/locale/sv/LC_MESSAGES/libgda-2.mo @@ -235,7 +243,8 @@ share/locale/zh_TW/LC_MESSAGES/libgda-2.mo @dirrm share/gnome/libgda @dirrm lib/libgda/providers @dirrm lib/libgda -@dirrm include/libgda/sql -@dirrm include/libgda -@dirrm include/libgda-report +@dirrm include/libgda-1.2/sql +@dirrm include/libgda-1.2/libgda-report +@dirrm include/libgda-1.2/libgda +@dirrm include/libgda-1.2 @dirrm etc/libgda diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 18166163a64b..d82b6a0cd70c 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libgnomedb -PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTVERSION= 1.2.1 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/libgnomedb/1.0 +MASTER_SITE_SUBDIR= sources/libgnomedb/1.2 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +19,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgda2 gtksourceview \ - intlhack lthack -USE_INC_LIBTOOL_VER= 13 + intlhack +USE_LIBTOOL_VER=15 INSTALLS_OMF= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo index 55a23e5cd28d..223a42243fa1 100644 --- a/databases/libgnomedb/distinfo +++ b/databases/libgnomedb/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomedb-1.0.4.tar.bz2) = 956ddc8ddb3f4a2594a52b8a1b783f29 -SIZE (gnome2/libgnomedb-1.0.4.tar.bz2) = 621983 +MD5 (gnome2/libgnomedb-1.2.1.tar.bz2) = 5e2ff4eaa2bdb02493af4e21b5f5bf8b +SIZE (gnome2/libgnomedb-1.2.1.tar.bz2) = 645167 diff --git a/databases/libgnomedb/files/patch-Makefile.in b/databases/libgnomedb/files/patch-Makefile.in index ad0f1fd1b43e..c23a0014f8f1 100644 --- a/databases/libgnomedb/files/patch-Makefile.in +++ b/databases/libgnomedb/files/patch-Makefile.in @@ -1,12 +1,12 @@ ---- Makefile.in.orig Sun Apr 18 16:19:21 2004 -+++ Makefile.in Sun Apr 18 16:19:38 2004 -@@ -212,8 +212,7 @@ - - @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center components monikers - --@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc +--- Makefile.in.orig Thu Jul 22 10:56:33 2004 ++++ Makefile.in Thu Jul 22 10:57:14 2004 +@@ -251,8 +251,7 @@ + @HAVE_LIBGLADE_TRUE@LIBGLADE_DIRECTORY = glade + @BUILD_WITH_GNOME_FALSE@GNOME_DIRECTORY = + @BUILD_WITH_GNOME_TRUE@GNOME_DIRECTORY = control-center -@ENABLE_GTK_DOC_FALSE@DOC_DIRECTORY = +-@ENABLE_GTK_DOC_TRUE@DOC_DIRECTORY = doc +DOC_DIRECTORY = doc - SUBDIRS = \ po \ + libgnomedb \ diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c deleted file mode 100644 index b652611d1d51..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-data-source-selector.c +++ /dev/null @@ -1,37 +0,0 @@ -2004-04-18 Joe Marcus Clarke <marcus@FreeBSD.org> - -* libgnomedb/gnome-db-data-source-selector.c: (show_data_sources): - -Be sure to add something to the DSN menu so that this menu gets initialized. -Failure to do so will cause a segmentation fault when trying to login to -the database. - ---- libgnomedb/gnome-db-data-source-selector.c.orig Sun Apr 18 21:41:59 2004 -+++ libgnomedb/gnome-db-data-source-selector.c Sun Apr 18 21:43:20 2004 -@@ -61,8 +61,25 @@ - dsn_info->name); - gnome_db_config_free_data_source_info (dsn_info); - } -- else -+ else { -+ GList *dsn_list; -+ GList *l; -+ -+ /* load data sources */ -+ dsn_list = gnome_db_config_get_data_source_list (); -+ for (l = dsn_list; l != NULL; l = l->next) { -+ GdaDataSourceInfo *dsn_info = (GdaDataSourceInfo *) l->data; -+ -+ if (!dsn_info) -+ continue; -+ -+ /* add the data source to the option menu */ -+ gnome_db_option_menu_add_item (GTK_OPTION_MENU (selector), dsn_info->name); -+ } -+ -+ gnome_db_config_free_data_source_list (dsn_list); - gtk_option_menu_set_history (GTK_OPTION_MENU (selector), 0); -+ } - } - - /* diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c new file mode 100644 index 000000000000..27555ef8d7e3 --- /dev/null +++ b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-find-dialog.c @@ -0,0 +1,16 @@ +--- libgnomedb/gnome-db-find-dialog.c.orig Thu Jul 22 17:40:26 2004 ++++ libgnomedb/gnome-db-find-dialog.c Thu Jul 22 17:41:02 2004 +@@ -216,11 +216,12 @@ + GtkWidget * + gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm) + { ++ GnomeDbFindDialog *dialog; + g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL); + + g_object_ref (dm); + +- GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title); ++ dialog = gnome_db_find_dialog_new (title); + gnome_db_find_dialog_add_fields_from_model (dialog, dm); + + g_object_unref (dm); diff --git a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c b/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c deleted file mode 100644 index 392c7d06ec20..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_gnome-db-form.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomedb/gnome-db-form.c.orig Mon Aug 2 10:13:56 2004 -+++ libgnomedb/gnome-db-form.c Mon Aug 2 10:14:09 2004 -@@ -582,6 +582,6 @@ - form->priv->navigator_current_row = row; - show_navigator_row (form); - break; -- case GNOME_DB_FORM_TYPE_LIST : -+ case GNOME_DB_FORM_TYPE_LIST :; - } - } diff --git a/databases/libgnomedb/files/patch-libgnomedb_utils.c b/databases/libgnomedb/files/patch-libgnomedb_utils.c deleted file mode 100644 index 92979f008432..000000000000 --- a/databases/libgnomedb/files/patch-libgnomedb_utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomedb/utils.c.orig Mon Aug 2 10:12:06 2004 -+++ libgnomedb/utils.c Mon Aug 2 10:12:16 2004 -@@ -45,7 +45,7 @@ - dialog = gnome_db_error_dialog_new (_("Error")); - gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (dialog), - gda_connection_get_errors (cnc)); -- default : -+ default :; - } - } - diff --git a/databases/libgnomedb/files/patch-po::Makefile.in.in b/databases/libgnomedb/files/patch-po::Makefile.in.in new file mode 100644 index 000000000000..2e0e6e70ee75 --- /dev/null +++ b/databases/libgnomedb/files/patch-po::Makefile.in.in @@ -0,0 +1,10 @@ +--- po/Makefile.in.in.orig Thu Jul 22 11:06:21 2004 ++++ po/Makefile.in.in Thu Jul 22 11:06:58 2004 +@@ -35,6 +35,7 @@ + + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ ++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + + CC = @CC@ + GENCAT = @GENCAT@ diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist index a7c91a4d5591..0f6a2c9ef98d 100644 --- a/databases/libgnomedb/pkg-plist +++ b/databases/libgnomedb/pkg-plist @@ -1,91 +1,95 @@ bin/gnome-database-properties -include/libgnomedb/gnome-db-browser.h -include/libgnomedb/gnome-db-combo.h -include/libgnomedb/gnome-db-config.h -include/libgnomedb/gnome-db-connection-properties.h -include/libgnomedb/gnome-db-connection-selector.h -include/libgnomedb/gnome-db-control-widget.h -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-i18n.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-query-builder.h -include/libgnomedb/gnome-db-report-editor.h -include/libgnomedb/gnome-db-stock.h -include/libgnomedb/gnome-db-table-editor.h -include/libgnomedb/gnome-db-util.h -include/libgnomedb/libgnomedb.h -lib/bonobo/monikers/libmoniker_database.so +include/libgnomedb-1.2/libgnomedb/gnome-db-browser.h +include/libgnomedb-1.2/libgnomedb/gnome-db-combo.h +include/libgnomedb-1.2/libgnomedb/gnome-db-config.h +include/libgnomedb-1.2/libgnomedb/gnome-db-connection-properties.h +include/libgnomedb-1.2/libgnomedb/gnome-db-connection-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-control-widget.h +include/libgnomedb-1.2/libgnomedb/gnome-db-control.h +include/libgnomedb-1.2/libgnomedb/gnome-db-data-source-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config-druid.h +include/libgnomedb-1.2/libgnomedb/gnome-db-dsn-config.h +include/libgnomedb-1.2/libgnomedb/gnome-db-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-error-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-error.h +include/libgnomedb-1.2/libgnomedb/gnome-db-find-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-form.h +include/libgnomedb-1.2/libgnomedb/gnome-db-gray-bar.h +include/libgnomedb-1.2/libgnomedb/gnome-db-grid.h +include/libgnomedb-1.2/libgnomedb/gnome-db-i18n.h +include/libgnomedb-1.2/libgnomedb/gnome-db-icon-list.h +include/libgnomedb-1.2/libgnomedb/gnome-db-list.h +include/libgnomedb-1.2/libgnomedb/gnome-db-login-dialog.h +include/libgnomedb-1.2/libgnomedb/gnome-db-login.h +include/libgnomedb-1.2/libgnomedb/gnome-db-model.h +include/libgnomedb-1.2/libgnomedb/gnome-db-provider-selector.h +include/libgnomedb-1.2/libgnomedb/gnome-db-query-builder.h +include/libgnomedb-1.2/libgnomedb/gnome-db-report-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-stock.h +include/libgnomedb-1.2/libgnomedb/gnome-db-table-editor.h +include/libgnomedb-1.2/libgnomedb/gnome-db-util.h +include/libgnomedb-1.2/libgnomedb/libgnomedb.h lib/libglade/2.0/libgnomedb.so lib/libgnomedb-2.a lib/libgnomedb-2.so -lib/libgnomedb-2.so.3 +lib/libgnomedb-2.so.4 libdata/pkgconfig/libgnomedb.pc -libdata/bonobo/servers/GNOME_Database_Components.server -libdata/bonobo/servers/GNOME_Database_Monikers.server -libexec/gnome-database-components -%%DOCSDIR%%/fdl-section1.html -%%DOCSDIR%%/fdl-section10.html -%%DOCSDIR%%/fdl-section2.html -%%DOCSDIR%%/fdl-section3.html -%%DOCSDIR%%/fdl-section4.html -%%DOCSDIR%%/fdl-section5.html -%%DOCSDIR%%/fdl-section6.html -%%DOCSDIR%%/fdl-section7.html -%%DOCSDIR%%/fdl-section8.html -%%DOCSDIR%%/fdl-section9.html -%%DOCSDIR%%/fdl-using.html -%%DOCSDIR%%/fdl.html -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/libgnomedb-basic.html -%%DOCSDIR%%/libgnomedb-bonobo.html -%%DOCSDIR%%/libgnomedb-gnome-db-config.html -%%DOCSDIR%%/libgnomedb-gnome-db-model.html -%%DOCSDIR%%/libgnomedb-gnome-db-stock.html -%%DOCSDIR%%/libgnomedb-gnome-db-util.html -%%DOCSDIR%%/libgnomedb-gnomedbbrowser.html -%%DOCSDIR%%/libgnomedb-gnomedbcombo.html -%%DOCSDIR%%/libgnomedb-gnomedbconnectionproperties.html -%%DOCSDIR%%/libgnomedb-gnomedbconnectionselector.html -%%DOCSDIR%%/libgnomedb-gnomedbcontrol.html -%%DOCSDIR%%/libgnomedb-gnomedbcontrolwidget.html -%%DOCSDIR%%/libgnomedb-gnomedbdatasourceselector.html -%%DOCSDIR%%/libgnomedb-gnomedbdsnconfig.html -%%DOCSDIR%%/libgnomedb-gnomedbdsnconfigdruid.html -%%DOCSDIR%%/libgnomedb-gnomedbeditor.html -%%DOCSDIR%%/libgnomedb-gnomedberror.html -%%DOCSDIR%%/libgnomedb-gnomedberrordialog.html -%%DOCSDIR%%/libgnomedb-gnomedbform.html -%%DOCSDIR%%/libgnomedb-gnomedbgraybar.html -%%DOCSDIR%%/libgnomedb-gnomedbgrid.html -%%DOCSDIR%%/libgnomedb-gnomedbiconlist.html -%%DOCSDIR%%/libgnomedb-gnomedblist.html -%%DOCSDIR%%/libgnomedb-gnomedblogin.html -%%DOCSDIR%%/libgnomedb-gnomedblogindialog.html -%%DOCSDIR%%/libgnomedb-gnomedbproviderselector.html -%%DOCSDIR%%/libgnomedb-gnomedbquerybuilder.html -%%DOCSDIR%%/libgnomedb-gnomedbreporteditor.html -%%DOCSDIR%%/libgnomedb-gnomedbtableeditor.html -%%DOCSDIR%%/libgnomedb-gnomedbwindow.html -%%DOCSDIR%%/libgnomedb-introduction.html -%%DOCSDIR%%/libgnomedb-libgnomedb.html -%%DOCSDIR%%/libgnomedb-widgets.html share/gnome/control-center-2.0/capplets/database-properties.desktop share/gnome/gnome-db/ui/db-shell.xml +share/gnome/gtk-doc/html/libgnomedb/fdl-section1.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section10.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section2.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section3.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section4.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section5.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section6.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section7.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section8.html +share/gnome/gtk-doc/html/libgnomedb/fdl-section9.html +share/gnome/gtk-doc/html/libgnomedb/fdl-using.html +share/gnome/gtk-doc/html/libgnomedb/fdl.html +share/gnome/gtk-doc/html/libgnomedb/home.png +share/gnome/gtk-doc/html/libgnomedb/index.html +share/gnome/gtk-doc/html/libgnomedb/index.sgml +share/gnome/gtk-doc/html/libgnomedb/left.png +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbBrowser.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbCombo.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionProperties.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbConnectionSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControl.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbControlWidget.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDataSourceSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfig.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbDsnConfigDruid.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbError.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbErrorDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbFindDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbForm.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrayBar.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbGrid.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbIconList.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbList.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLogin.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbLoginDialog.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbProviderSelector.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbQueryBuilder.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbReportEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbTableEditor.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-GnomeDbWindow.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-basic.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-bonobo.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-config.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-model.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-stock.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-gnome-db-util.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-introduction.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-libgnomedb.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb-widgets.html +share/gnome/gtk-doc/html/libgnomedb/libgnomedb.devhelp +share/gnome/gtk-doc/html/libgnomedb/right.png +share/gnome/gtk-doc/html/libgnomedb/style.css +share/gnome/gtk-doc/html/libgnomedb/up.png share/gnome/mime-info/libgnomedb.keys share/gnome/mime-info/libgnomedb.mime share/gnome/omf/libgnomedb/libgnomedb-C.omf @@ -99,12 +103,15 @@ share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-database_48x48.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-field_16x16.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 share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png +share/gnome/pixmaps/libgnomedb/gnome-db-relations_16x16.png +share/gnome/pixmaps/libgnomedb/gnome-db-relations_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png @@ -136,12 +143,13 @@ share/locale/ga/LC_MESSAGES/libgnomedb-2.mo share/locale/gl/LC_MESSAGES/libgnomedb-2.mo share/locale/hr/LC_MESSAGES/libgnomedb-2.mo share/locale/hu/LC_MESSAGES/libgnomedb-2.mo -share/locale/id/LC_MESSAGES/libgnomedb-2.mo share/locale/it/LC_MESSAGES/libgnomedb-2.mo share/locale/ja/LC_MESSAGES/libgnomedb-2.mo +share/locale/ka/LC_MESSAGES/libgnomedb-2.mo share/locale/ko/LC_MESSAGES/libgnomedb-2.mo share/locale/ml/LC_MESSAGES/libgnomedb-2.mo share/locale/ms/LC_MESSAGES/libgnomedb-2.mo +share/locale/nb/LC_MESSAGES/libgnomedb-2.mo share/locale/nl/LC_MESSAGES/libgnomedb-2.mo share/locale/no/LC_MESSAGES/libgnomedb-2.mo share/locale/pl/LC_MESSAGES/libgnomedb-2.mo @@ -150,6 +158,7 @@ share/locale/pt_BR/LC_MESSAGES/libgnomedb-2.mo share/locale/ru/LC_MESSAGES/libgnomedb-2.mo share/locale/sk/LC_MESSAGES/libgnomedb-2.mo share/locale/sl/LC_MESSAGES/libgnomedb-2.mo +share/locale/sq/LC_MESSAGES/libgnomedb-2.mo share/locale/sr/LC_MESSAGES/libgnomedb-2.mo share/locale/sr@Latn/LC_MESSAGES/libgnomedb-2.mo share/locale/sv/LC_MESSAGES/libgnomedb-2.mo @@ -161,7 +170,10 @@ share/locale/zh_CN/LC_MESSAGES/libgnomedb-2.mo share/locale/zh_TW/LC_MESSAGES/libgnomedb-2.mo @dirrm share/gnome/pixmaps/libgnomedb @dirrm share/gnome/omf/libgnomedb +@dirrm share/gnome/gtk-doc/html/libgnomedb +@unexec rmdir %D/share/gnome/gtk-doc/html 2> /dev/null || true +@unexec rmdir %D/share/gnome/gtk-doc 2> /dev/null || true @dirrm share/gnome/gnome-db/ui @dirrm share/gnome/gnome-db -@dirrm %%DOCSDIR%% -@dirrm include/libgnomedb +@dirrm include/libgnomedb-1.2/libgnomedb +@dirrm include/libgnomedb-1.2 diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile index 83797f1daf3c..fed889a3479d 100644 --- a/databases/mergeant/Makefile +++ b/databases/mergeant/Makefile @@ -6,11 +6,11 @@ # PORTNAME= mergeant -PORTVERSION= 0.12.1 -PORTREVISION= 3 +PORTVERSION= 0.52 +PORTREVISION= 2 CATEGORIES= databases gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.12 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.52 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,11 +18,12 @@ COMMENT= Provide uniform access to data sources for the GNOME 2 environment USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomedb libgnomeprintui +USE_GNOME= gnomeprefix intlhack gnomehack libgnomedb libgnomeprintui USE_PERL5= yes -USE_LIBTOOL_VER= 15 +USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes +INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index dfe2c3e931bd..9289ea8c7364 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/mergeant-0.12.1.tar.bz2) = 42a2f6778b81409db6cd1baa49663dca -SIZE (gnome2/mergeant-0.12.1.tar.bz2) = 1204581 +MD5 (gnome2/mergeant-0.52.tar.bz2) = e9f96b824e452e9b9406b4c11f005b95 +SIZE (gnome2/mergeant-0.52.tar.bz2) = 2058623 diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in new file mode 100644 index 000000000000..52e62979ef48 --- /dev/null +++ b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in @@ -0,0 +1,11 @@ +--- doc/libmergeant/C/Makefile.in.orig Sat Aug 14 04:12:49 2004 ++++ doc/libmergeant/C/Makefile.in Sat Aug 14 04:13:07 2004 +@@ -214,7 +214,7 @@ + + # The name of the module. + DOC_MODULE = libmergeant +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(prefix)/share/doc + + # The top-level SGML file. + DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in deleted file mode 100644 index f65cecae49d6..000000000000 --- a/databases/mergeant/files/patch-lib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig Sat Sep 14 18:40:05 2002 -+++ lib/Makefile.in Sat Sep 14 18:40:22 2002 -@@ -120,7 +120,7 @@ - - noinst_LTLIBRARIES = libgdbshared.la - --INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\" -+INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\" - - - libgdbshared_headers = gnome-db-shortcut.h diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c new file mode 100644 index 000000000000..15005003ecdb --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c @@ -0,0 +1,17 @@ +--- libmergeant/graph/mg-canvas-field.c.orig Sat Aug 14 04:04:07 2004 ++++ libmergeant/graph/mg-canvas-field.c Sat Aug 14 04:04:40 2004 +@@ -146,13 +146,13 @@ + gpointer ptr; + GString *string; + MgServerDataType *dtype; ++ MgEntity *ent; + + cf = MG_CANVAS_FIELD (object); + + switch (param_id) { + case PROP_FIELD: + ptr = g_value_get_pointer (value); +- MgEntity *ent; + g_return_if_fail (IS_MG_FIELD (ptr)); + + /* signals management */ diff --git a/databases/mergeant/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c new file mode 100644 index 000000000000..168e15c413d3 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-form.c @@ -0,0 +1,19 @@ +--- libmergeant/mg-form.c.orig Thu Aug 12 22:24:32 2004 ++++ libmergeant/mg-form.c Thu Aug 12 22:24:48 2004 +@@ -586,6 +586,7 @@ + { + PangoAttrList *attrs = NULL; + PangoAttribute *att; ++ GSList *list; + + if (show_mark) { + attrs = pango_attr_list_new (); +@@ -595,7 +596,7 @@ + pango_attr_list_insert (attrs, att); + } + +- GSList *list = form->priv->not_null_labels; ++ list = form->priv->not_null_labels; + while (list) { + gtk_label_set_attributes (GTK_LABEL (list->data), attrs); + list = g_slist_next (list); diff --git a/databases/mergeant/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c new file mode 100644 index 000000000000..60bfe9b4205c --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-parameter.c @@ -0,0 +1,13 @@ +--- libmergeant/mg-parameter.c.orig Thu Aug 12 22:25:38 2004 ++++ libmergeant/mg-parameter.c Thu Aug 12 22:25:53 2004 +@@ -608,9 +608,9 @@ + mg_parameter_set_value (MgParameter *param, const GdaValue *value) + { + gboolean changed = TRUE; ++ const GdaValue *current_val; + g_return_if_fail (param && IS_MG_PARAMETER (param)); + g_return_if_fail (param->priv); +- const GdaValue *current_val; + + param->priv->invalid_forced = FALSE; + diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c new file mode 100644 index 000000000000..41bf5bf1a138 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-query.c @@ -0,0 +1,25 @@ +--- libmergeant/mg-query.c.orig Sun Aug 8 11:20:06 2004 ++++ libmergeant/mg-query.c Wed Jan 5 02:07:47 2005 +@@ -44,7 +44,7 @@ + #include "mg-server-aggregate.h" + #include "mg-data-handler.h" + +-#include <libgda/sql/sql_parser.h> ++#include <libgda-1.2/sql/sql_parser.h> + #include "mg-qf-func.h" + + /* +@@ -5117,9 +5117,11 @@ + if (!cond) + has_error = TRUE; + else { ++ MgQfield *field_left; ++ MgQfield *field_right; + g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL); +- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); +- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); ++ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); ++ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); + + if (IS_MG_QF_FIELD (field_left)) { + g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL); diff --git a/databases/mergeant/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c new file mode 100644 index 000000000000..b9a36b2e18d2 --- /dev/null +++ b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c @@ -0,0 +1,14 @@ +--- libmergeant/mg-work-grid.c.orig Sat Aug 14 03:59:47 2004 ++++ libmergeant/mg-work-grid.c Sat Aug 14 04:00:02 2004 +@@ -2299,10 +2299,10 @@ + GtkTreeModel *tree_model, GtkTreeIter *iter, + MgWorkCore *core, MgDataEntryAttribute requested_status) + { +- g_return_if_fail (user_modif); + guint attrs; + GtkTreePath *path; + gint row; ++ g_return_if_fail (user_modif); + + switch (requested_status) { + case MG_DATA_ENTRY_IS_NULL: diff --git a/databases/mergeant/files/patch-src_Makefile.in b/databases/mergeant/files/patch-src_Makefile.in deleted file mode 100644 index 1e4f74872a9b..000000000000 --- a/databases/mergeant/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Thu Jul 29 09:01:30 2004 -+++ src/Makefile.in Thu Jul 29 09:01:40 2004 -@@ -141,7 +141,7 @@ - mergeant_LDADD = $(MERGEANT_LIBS) $(top_builddir)/lib/libmergeant.la query-fields/libqueryfields.a - - --mergeant_LDFLAGS = -export-dynamic -dlopen -+mergeant_LDFLAGS = -export-dynamic - mergeant_DEPENDENCIES = query-fields/libqueryfields.a - - DTD_FILES = mergeant.dtd diff --git a/databases/mergeant/files/patch-src_interface_cb.c b/databases/mergeant/files/patch-src_interface_cb.c deleted file mode 100644 index 6cbd2d2b3f63..000000000000 --- a/databases/mergeant/files/patch-src_interface_cb.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/interface_cb.c.orig Mon Aug 2 13:38:56 2004 -+++ src/interface_cb.c Mon Aug 2 13:39:10 2004 -@@ -2209,6 +2209,6 @@ - gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (conf->error_dlg), - gda_connection_get_errors (cnc)); - break; -- default : -+ default :; - } - } diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in deleted file mode 100644 index 65ae9e7248d0..000000000000 --- a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/netaddr/Makefile.in.orig Sat Sep 14 18:56:12 2002 -+++ src/plugins/netaddr/Makefile.in Sat Sep 14 18:57:13 2002 -@@ -125,7 +125,7 @@ - lib_LTLIBRARIES_PLUGIN = libPnetaddr.la - libPnetaddr_la_SOURCES = netaddr.c baseplugin.h - libPnetaddr_la_LIBADD = --libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic - - # Build a libtool library, for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in deleted file mode 100644 index 3c54fdcd0135..000000000000 --- a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/picts/Makefile.in.orig Sat Sep 14 18:57:58 2002 -+++ src/plugins/picts/Makefile.in Sat Sep 14 18:58:15 2002 -@@ -127,7 +127,7 @@ - libPpicts_la_SOURCES = picts_plugin.c baseplugin.h - libPpicts_la_LIBADD = - --libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version - - # Build a libtool library, libggnomedb.la for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in deleted file mode 100644 index ae8b1158cd68..000000000000 --- a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/plugins/sample/Makefile.in.orig Sat Sep 14 18:58:54 2002 -+++ src/plugins/sample/Makefile.in Sat Sep 14 18:59:04 2002 -@@ -127,7 +127,7 @@ - libPsample_la_SOURCES = sample_plugin.c baseplugin.h - libPsample_la_LIBADD = - --libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0 -+libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version - - # Build a libtool library, libggnomedb.la for installation in libdir. - lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN) diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist index d4ade5f9bc46..75d763c41237 100644 --- a/databases/mergeant/pkg-plist +++ b/databases/mergeant/pkg-plist @@ -1,52 +1,252 @@ bin/mergeant -lib/mergeant/plugins/libPnetaddr.so -lib/mergeant/plugins/libPpicts.so -lib/mergeant/plugins/libPsample.so +bin/mg-db-browser +bin/mg-test-dyn +bin/mg-test-graph +bin/mg-test-grapher +bin/mg-test-handlers +bin/mg-test-selector +bin/mg-test-sqlquery +bin/mg-test1 +bin/mg-test2 +bin/mg-test3 +bin/mg-verify-file +include/libmergeant/graph/mg-canvas-cursor.h +include/libmergeant/graph/mg-canvas-db-relations.h +include/libmergeant/graph/mg-canvas-entity.h +include/libmergeant/graph/mg-canvas-field.h +include/libmergeant/graph/mg-canvas-fkconstraint.h +include/libmergeant/graph/mg-canvas-item.h +include/libmergeant/graph/mg-canvas-text.h +include/libmergeant/graph/mg-canvas-tip.h +include/libmergeant/graph/mg-canvas.h +include/libmergeant/graph/mg-graph-item.h +include/libmergeant/graph/mg-graph.h +include/libmergeant/handlers/mg-data-cell-renderer-boolean.h +include/libmergeant/handlers/mg-data-cell-renderer-combo.h +include/libmergeant/handlers/mg-data-cell-renderer-info.h +include/libmergeant/handlers/mg-data-cell-renderer-textual.h +include/libmergeant/handlers/mg-entry-boolean.h +include/libmergeant/handlers/mg-entry-combo.h +include/libmergeant/handlers/mg-entry-none.h +include/libmergeant/handlers/mg-entry-shell.h +include/libmergeant/handlers/mg-entry-string.h +include/libmergeant/handlers/mg-entry-time.h +include/libmergeant/handlers/mg-entry-wrapper.h +include/libmergeant/handlers/mg-handler-boolean.h +include/libmergeant/handlers/mg-handler-none.h +include/libmergeant/handlers/mg-handler-numerical.h +include/libmergeant/handlers/mg-handler-string.h +include/libmergeant/handlers/mg-handler-time.h +include/libmergeant/libmergeant.h +include/libmergeant/marshal.h +include/libmergeant/mg-base.h +include/libmergeant/mg-condition.h +include/libmergeant/mg-conf.h +include/libmergeant/mg-context.h +include/libmergeant/mg-custom-layout.h +include/libmergeant/mg-data-entry.h +include/libmergeant/mg-data-handler.h +include/libmergeant/mg-database.h +include/libmergeant/mg-db-constraint.h +include/libmergeant/mg-db-field.h +include/libmergeant/mg-db-table.h +include/libmergeant/mg-dbms-update-viewer.h +include/libmergeant/mg-defs.h +include/libmergeant/mg-entity.h +include/libmergeant/mg-enums.h +include/libmergeant/mg-field.h +include/libmergeant/mg-form.h +include/libmergeant/mg-graphviz.h +include/libmergeant/mg-join.h +include/libmergeant/mg-parameter.h +include/libmergeant/mg-qf-all.h +include/libmergeant/mg-qf-field.h +include/libmergeant/mg-qf-func.h +include/libmergeant/mg-qf-value.h +include/libmergeant/mg-qfield.h +include/libmergeant/mg-query.h +include/libmergeant/mg-ref-base.h +include/libmergeant/mg-referer.h +include/libmergeant/mg-renderer.h +include/libmergeant/mg-result-set.h +include/libmergeant/mg-selector-private.h +include/libmergeant/mg-selector.h +include/libmergeant/mg-server-aggregate.h +include/libmergeant/mg-server-data-type.h +include/libmergeant/mg-server-function.h +include/libmergeant/mg-server.h +include/libmergeant/mg-target.h +include/libmergeant/mg-util.h +include/libmergeant/mg-work-core.h +include/libmergeant/mg-work-form.h +include/libmergeant/mg-work-grid.h +include/libmergeant/mg-work-layout.h +include/libmergeant/mg-work-matrix.h +include/libmergeant/mg-work-widget.h +include/libmergeant/mg-xml-storage.h +include/libmergeant/missing.h +include/libmergeant/sel-aggregates.h +include/libmergeant/sel-data-types.h +include/libmergeant/sel-forms.h +include/libmergeant/sel-functions.h +include/libmergeant/sel-graphs.h +include/libmergeant/sel-onequery.h +include/libmergeant/sel-onetable.h +include/libmergeant/sel-onetarget.h +include/libmergeant/sel-queries.h +include/libmergeant/sel-tables.h +include/libmergeant/utility.h +lib/libmergeant-2.a +lib/libmergeant-2.so +lib/libmergeant-2.so.1 +lib/libmergeant_graph-2.a +lib/libmergeant_graph-2.so +lib/libmergeant_graph-2.so.1 +lib/libmergeant_handlers-2.a +lib/libmergeant_handlers-2.so +lib/libmergeant_handlers-2.so.1 +libdata/bonobo/servers/GNOME_Mergeant.server +libdata/pkgconfig/libmergeant.pc +share/doc/libmergeant/MgBase.html +share/doc/libmergeant/MgCanvas.html +share/doc/libmergeant/MgCanvasCursor.html +share/doc/libmergeant/MgCanvasDbRelations.html +share/doc/libmergeant/MgCanvasEntity.html +share/doc/libmergeant/MgCanvasField.html +share/doc/libmergeant/MgCanvasItem.html +share/doc/libmergeant/MgCanvasText.html +share/doc/libmergeant/MgCanvasTip.html +share/doc/libmergeant/MgCondition.html +share/doc/libmergeant/MgConf.html +share/doc/libmergeant/MgContext.html +share/doc/libmergeant/MgCustomLayout.html +share/doc/libmergeant/MgDataCellRendererBoolean.html +share/doc/libmergeant/MgDataCellRendererInfo.html +share/doc/libmergeant/MgDataCellRendererTextual.html +share/doc/libmergeant/MgDataEntry.html +share/doc/libmergeant/MgDataHandler.html +share/doc/libmergeant/MgDatabase.html +share/doc/libmergeant/MgDbConstraint.html +share/doc/libmergeant/MgDbField.html +share/doc/libmergeant/MgDbTable.html +share/doc/libmergeant/MgDbmsUpdateViewer.html +share/doc/libmergeant/MgEntity.html +share/doc/libmergeant/MgEntryBoolean.html +share/doc/libmergeant/MgEntryCidr.html +share/doc/libmergeant/MgEntryCombo.html +share/doc/libmergeant/MgEntryNone.html +share/doc/libmergeant/MgEntryPassmd5.html +share/doc/libmergeant/MgEntryShell.html +share/doc/libmergeant/MgEntryString.html +share/doc/libmergeant/MgEntryTime.html +share/doc/libmergeant/MgEntryWrapper.html +share/doc/libmergeant/MgField.html +share/doc/libmergeant/MgForm.html +share/doc/libmergeant/MgGraph.html +share/doc/libmergeant/MgGraphItem.html +share/doc/libmergeant/MgGraphviz.html +share/doc/libmergeant/MgHandlerBoolean.html +share/doc/libmergeant/MgHandlerCidr.html +share/doc/libmergeant/MgHandlerNone.html +share/doc/libmergeant/MgHandlerNumerical.html +share/doc/libmergeant/MgHandlerPassmd5.html +share/doc/libmergeant/MgHandlerString.html +share/doc/libmergeant/MgHandlerText.html +share/doc/libmergeant/MgHandlerTime.html +share/doc/libmergeant/MgJoin.html +share/doc/libmergeant/MgParameter.html +share/doc/libmergeant/MgQfAll.html +share/doc/libmergeant/MgQfField.html +share/doc/libmergeant/MgQfFunc.html +share/doc/libmergeant/MgQfValue.html +share/doc/libmergeant/MgQfield.html +share/doc/libmergeant/MgQuery.html +share/doc/libmergeant/MgRefBase.html +share/doc/libmergeant/MgReferer.html +share/doc/libmergeant/MgRenderer.html +share/doc/libmergeant/MgResultSet.html +share/doc/libmergeant/MgSelector.html +share/doc/libmergeant/MgServer.html +share/doc/libmergeant/MgServerAggregate.html +share/doc/libmergeant/MgServerDataType.html +share/doc/libmergeant/MgServerFunction.html +share/doc/libmergeant/MgTarget.html +share/doc/libmergeant/MgWorkCore.html +share/doc/libmergeant/MgWorkForm.html +share/doc/libmergeant/MgWorkGrid.html +share/doc/libmergeant/MgWorkLayout.html +share/doc/libmergeant/MgWorkMatrix.html +share/doc/libmergeant/MgWorkWidget.html +share/doc/libmergeant/MgXmlStorage.html +share/doc/libmergeant/ch01.html +share/doc/libmergeant/ch02.html +share/doc/libmergeant/ch03.html +share/doc/libmergeant/ch04.html +share/doc/libmergeant/ch04s02.html +share/doc/libmergeant/ch05.html +share/doc/libmergeant/ch06.html +share/doc/libmergeant/ch07.html +share/doc/libmergeant/ch08.html +share/doc/libmergeant/ch08s02.html +share/doc/libmergeant/ch09.html +share/doc/libmergeant/ch09s02.html +share/doc/libmergeant/ch09s03.html +share/doc/libmergeant/ch10.html +share/doc/libmergeant/ch11.html +share/doc/libmergeant/ch12.html +share/doc/libmergeant/example_bad.png +share/doc/libmergeant/example_result.png +share/doc/libmergeant/home.png +share/doc/libmergeant/index.html +share/doc/libmergeant/index.sgml +share/doc/libmergeant/left.png +share/doc/libmergeant/libmergeant.devhelp +share/doc/libmergeant/query01.png +share/doc/libmergeant/right.png +share/doc/libmergeant/up.png share/gnome/application-registry/mergeant.applications share/gnome/applications/mergeant.desktop -share/gnome/help/mergeant/C/c137.html -share/gnome/help/mergeant/C/c220.html -share/gnome/help/mergeant/C/c25.html -share/gnome/help/mergeant/C/c254.html -share/gnome/help/mergeant/C/c342.html -share/gnome/help/mergeant/C/c372.html -share/gnome/help/mergeant/C/c375.html -share/gnome/help/mergeant/C/f20.html -share/gnome/help/mergeant/C/images/env_form.jpg -share/gnome/help/mergeant/C/images/env_grid.jpg -share/gnome/help/mergeant/C/images/env_prop.jpg -share/gnome/help/mergeant/C/images/framework.eps -share/gnome/help/mergeant/C/images/framework.fig -share/gnome/help/mergeant/C/images/framework.jpg -share/gnome/help/mergeant/C/images/gas.gif -share/gnome/help/mergeant/C/images/main.jpg -share/gnome/help/mergeant/C/images/plugins_dt.jpg -share/gnome/help/mergeant/C/images/plugins_objects.jpg -share/gnome/help/mergeant/C/images/plugins_sum.jpg -share/gnome/help/mergeant/C/images/properties.jpg -share/gnome/help/mergeant/C/images/queryprop.jpg -share/gnome/help/mergeant/C/images/queryprop_cond.jpg -share/gnome/help/mergeant/C/images/queryprop_joins.jpg -share/gnome/help/mergeant/C/images/queryprop_objects.jpg -share/gnome/help/mergeant/C/images/queryprop_sql.jpg -share/gnome/help/mergeant/C/images/rels.jpg -share/gnome/help/mergeant/C/images/sysinfo.jpg +share/gnome/help/mergeant/C/book1.html +share/gnome/help/mergeant/C/c13.html +share/gnome/help/mergeant/C/c47.html +share/gnome/help/mergeant/C/c68.html +share/gnome/help/mergeant/C/c76.html +share/gnome/help/mergeant/C/c8.html +share/gnome/help/mergeant/C/c84.html +share/gnome/help/mergeant/C/c94.html +share/gnome/help/mergeant/C/images/datasources.png +share/gnome/help/mergeant/C/images/dba_properties.png +share/gnome/help/mergeant/C/images/workspace-data-types.png +share/gnome/help/mergeant/C/images/workspace-graphs.png +share/gnome/help/mergeant/C/images/workspace-queries.png +share/gnome/help/mergeant/C/images/workspace.png share/gnome/help/mergeant/C/index.html +share/gnome/help/mergeant/C/stylesheet-images/caution.gif +share/gnome/help/mergeant/C/stylesheet-images/home.gif +share/gnome/help/mergeant/C/stylesheet-images/important.gif +share/gnome/help/mergeant/C/stylesheet-images/next.gif +share/gnome/help/mergeant/C/stylesheet-images/note.gif +share/gnome/help/mergeant/C/stylesheet-images/prev.gif +share/gnome/help/mergeant/C/stylesheet-images/tip.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-blank.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-minus.gif +share/gnome/help/mergeant/C/stylesheet-images/toc-plus.gif +share/gnome/help/mergeant/C/stylesheet-images/up.gif +share/gnome/help/mergeant/C/stylesheet-images/warning.gif share/gnome/help/mergeant/C/topic.dat -share/gnome/help/mergeant/C/x110.html -share/gnome/help/mergeant/C/x168.html -share/gnome/help/mergeant/C/x210.html -share/gnome/help/mergeant/C/x236.html -share/gnome/help/mergeant/C/x245.html -share/gnome/help/mergeant/C/x313.html -share/gnome/help/mergeant/C/x32.html -share/gnome/help/mergeant/C/x350.html -share/gnome/help/mergeant/C/x66.html -share/gnome/help/mergeant/C/x80.html -share/gnome/help/mergeant/C/x92.html -share/gnome/mergeant/dtd/mergeant.dtd +share/gnome/help/mergeant/C/x19.html +share/gnome/help/mergeant/C/x40.html +share/gnome/mergeant/dtd/libmergeant.dtd +share/gnome/mergeant/plugins/libmergeant_handler_cidr.so +share/gnome/mergeant/plugins/libmergeant_handler_cidr.so.1 +share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so +share/gnome/mergeant/plugins/libmergeant_handler_passmd5.so.1 +share/gnome/mergeant/plugins/libmergeant_handler_text.so +share/gnome/mergeant/plugins/libmergeant_handler_text.so.1 +share/gnome/mergeant/ui/mergeant.xml share/gnome/mime-info/mergeant.keys share/gnome/mime-info/mergeant.mime +share/gnome/omf/libmergeant/libmergeant-C.omf share/gnome/omf/mergeant/mergeant-C.omf share/gnome/pixmaps/document-icons/gnome-application-x-mergeant.png share/gnome/pixmaps/mergeant/mergeant.png @@ -65,14 +265,20 @@ 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/am/LC_MESSAGES/mergeant.mo +share/locale/az/LC_MESSAGES/mergeant.mo share/locale/ca/LC_MESSAGES/mergeant.mo share/locale/cs/LC_MESSAGES/mergeant.mo share/locale/da/LC_MESSAGES/mergeant.mo share/locale/de/LC_MESSAGES/mergeant.mo +share/locale/el/LC_MESSAGES/mergeant.mo +share/locale/en_CA/LC_MESSAGES/mergeant.mo +share/locale/en_GB/LC_MESSAGES/mergeant.mo share/locale/es/LC_MESSAGES/mergeant.mo share/locale/fa/LC_MESSAGES/mergeant.mo share/locale/fr/LC_MESSAGES/mergeant.mo +share/locale/hr/LC_MESSAGES/mergeant.mo share/locale/it/LC_MESSAGES/mergeant.mo +share/locale/ml/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 @@ -87,13 +293,19 @@ share/locale/sv/LC_MESSAGES/mergeant.mo share/locale/tr/LC_MESSAGES/mergeant.mo share/locale/uk/LC_MESSAGES/mergeant.mo share/locale/vi/LC_MESSAGES/mergeant.mo +share/locale/zh_CN/LC_MESSAGES/mergeant.mo @dirrm share/gnome/pixmaps/mergeant @dirrm share/gnome/omf/mergeant +@dirrm share/gnome/omf/libmergeant +@dirrm share/gnome/mergeant/ui +@dirrm share/gnome/mergeant/plugins @dirrm share/gnome/mergeant/dtd @dirrm share/gnome/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 -@dirrm lib/mergeant/plugins -@dirrm lib/mergeant +@dirrm share/doc/libmergeant +@dirrm include/libmergeant/handlers +@dirrm include/libmergeant/graph +@dirrm include/libmergeant diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 8f118a9f5748..d6e79dff9447 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.8 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.10 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,12 +23,21 @@ INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel +USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ + libgnomeprintui gnomedesktop USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 -GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas +GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \ + gnome-search-tool.schemas logview.schemas + +post-extract: + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|
$$||g' + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index a5647e87561d..1e7ee27e21cb 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069 -SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576 +MD5 (gnome2/gnome-utils-2.10.0.tar.bz2) = 43644d28321645aa68428e99fadb2504 +SIZE (gnome2/gnome-utils-2.10.0.tar.bz2) = 2012166 diff --git a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c new file mode 100644 index 000000000000..0cc89594e169 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c @@ -0,0 +1,29 @@ +--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004 ++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004 +@@ -94,16 +94,20 @@ + gchar *message = NULL; + gchar *error_message = NULL; + GtkWidget *dialog; ++ GIOStatus status; + +- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); +- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); +- dialog = gtk_message_dialog_new (NULL, 0, ++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); ++ if (status == G_IO_STATUS_NORMAL) ++ { ++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); ++ dialog = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + message); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); +- exit (1); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ exit (1); ++ } + } + + (*save_callback) (save_user_data); diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c new file mode 100644 index 000000000000..325e50a3548d --- /dev/null +++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-callbacks.c @@ -0,0 +1,29 @@ +--- gsearchtool/gsearchtool-callbacks.c.orig Thu Dec 23 19:14:17 2004 ++++ gsearchtool/gsearchtool-callbacks.c Thu Dec 23 19:15:55 2004 +@@ -54,9 +54,11 @@ + quit_application (GSearchCommandDetails * command_details) + { + if (command_details->command_status == RUNNING) { +- command_details->command_status = MAKE_IT_QUIT; + #ifdef HAVE_GETPGID + pid_t pgid; ++#endif ++ command_details->command_status = MAKE_IT_QUIT; ++#ifdef HAVE_GETPGID + + pgid = getpgid (command_details->command_pid); + +@@ -122,10 +124,12 @@ + GSearchWindow * gsearch = data; + + if (gsearch->command_details->command_status == RUNNING) { ++#ifdef HAVE_GETPGID ++ pid_t pgid; ++#endif + gtk_widget_set_sensitive (gsearch->stop_button, FALSE); + gsearch->command_details->command_status = MAKE_IT_STOP; + #ifdef HAVE_GETPGID +- pid_t pgid; + + pgid = getpgid (gsearch->command_details->command_pid); + diff --git a/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c new file mode 100644 index 000000000000..03a974c23aa4 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-gsearchtool_gsearchtool-support.c @@ -0,0 +1,10 @@ +--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004 ++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004 +@@ -30,6 +30,7 @@ + #endif + + #include <glib/gi18n.h> ++#include <sys/types.h> + #include <regex.h> + #include <gdk/gdkx.h> + #include <bonobo-activation/bonobo-activation.h> diff --git a/deskutils/gnome-utils/files/patch-logview::log_repaint.c b/deskutils/gnome-utils/files/patch-logview::log_repaint.c deleted file mode 100644 index 3944b8205b12..000000000000 --- a/deskutils/gnome-utils/files/patch-logview::log_repaint.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/log_repaint.c 2001/11/23 16:01:55 1.1 -+++ logview/log_repaint.c 2001/11/23 16:02:30 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include <gnome.h> - #include "logview.h" diff --git a/deskutils/gnome-utils/files/patch-logview::logrtns.h b/deskutils/gnome-utils/files/patch-logview::logrtns.h deleted file mode 100644 index a39ce6a77b82..000000000000 --- a/deskutils/gnome-utils/files/patch-logview::logrtns.h +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/logrtns.h 2001/11/23 16:04:00 1.1 -+++ logview/logrtns.h 2001/11/23 16:04:14 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include "logview.h" - diff --git a/deskutils/gnome-utils/files/patch-logview_desc_db.c b/deskutils/gnome-utils/files/patch-logview_desc_db.c new file mode 100644 index 000000000000..5b687f492e88 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_desc_db.c @@ -0,0 +1,10 @@ +--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004 ++++ logview/desc_db.c Wed Dec 1 16:45:25 2004 +@@ -21,6 +21,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include "logview.h" + #include "desc_db.h" diff --git a/deskutils/gnome-utils/files/patch-logview_logview.c b/deskutils/gnome-utils/files/patch-logview_logview.c index 942ed8a02d6b..4ac243d34e9a 100644 --- a/deskutils/gnome-utils/files/patch-logview_logview.c +++ b/deskutils/gnome-utils/files/patch-logview_logview.c @@ -1,37 +1,29 @@ ---- logview/logview.c.orig Fri May 7 21:47:59 2004 -+++ logview/logview.c Wed Aug 4 18:40:24 2004 -@@ -781,7 +781,7 @@ +--- logview/logview.c.orig Tue Nov 30 00:29:01 2004 ++++ logview/logview.c Tue Nov 30 00:30:44 2004 +@@ -656,7 +656,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -804,7 +804,7 @@ +@@ -678,7 +678,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -838,7 +838,7 @@ +@@ -709,7 +709,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); -@@ -922,6 +922,7 @@ - /* remove trailing newline */ - if (logfile[strlen(logfile)-1] == '\n') - logfile[strlen(logfile)-1] = '\0'; -+ if (strcmp (logfile, "/dev/console") == 0) continue; - fprintf(stderr, "Found a logfile: (%s)\n", logfile); - return logfile; - } diff --git a/deskutils/gnome-utils/files/patch-logview_userprefs.c b/deskutils/gnome-utils/files/patch-logview_userprefs.c new file mode 100644 index 000000000000..d93f8ae57fc2 --- /dev/null +++ b/deskutils/gnome-utils/files/patch-logview_userprefs.c @@ -0,0 +1,10 @@ +--- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004 ++++ logview/userprefs.c Tue Nov 30 00:36:34 2004 +@@ -56,6 +56,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + return logfile; + } + } diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index cc90083672a7..9bb821653750 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -1,4 +1,6 @@ bin/gnome-dictionary +bin/gnome-panel-screenshot +bin/gnome-screenshot bin/gnome-search-tool bin/gnome-system-log libdata/bonobo/servers/GNOME_GDictApplet.server @@ -7,6 +9,7 @@ share/gnome/applications/gnome-dictionary.desktop share/gnome/applications/gnome-search-tool.desktop share/gnome/applications/gnome-system-log.desktop share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml +share/gnome/gnome-screenshot/glade/gnome-screenshot.glade 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 @@ -18,6 +21,10 @@ share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml share/gnome/help/gnome-dictionary/ja/legal.xml +share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png +share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png +share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/uk/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml @@ -39,6 +46,9 @@ share/gnome/help/gnome-search-tool/ko/legal.xml share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml share/gnome/help/gnome-search-tool/sv/legal.xml +share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/uk/legal.xml share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_CN/legal.xml @@ -72,6 +82,9 @@ share/gnome/help/gnome-system-log/ko/legal.xml share/gnome/help/gnome-system-log/sv/figures/syslog_window.png share/gnome/help/gnome-system-log/sv/gnome-system-log.xml share/gnome/help/gnome-system-log/sv/legal.xml +share/gnome/help/gnome-system-log/uk/figures/syslog_window.png +share/gnome/help/gnome-system-log/uk/gnome-system-log.xml +share/gnome/help/gnome-system-log/uk/legal.xml share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_CN/legal.xml @@ -80,6 +93,7 @@ share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_TW/legal.xml share/gnome/omf/gnome-utils/gnome-dictionary-C.omf share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf +share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf share/gnome/omf/gnome-utils/gnome-search-tool-C.omf share/gnome/omf/gnome-utils/gnome-search-tool-es.omf share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf @@ -87,6 +101,7 @@ share/gnome/omf/gnome-utils/gnome-search-tool-it.omf share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf +share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf @@ -98,6 +113,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-it.omf share/gnome/omf/gnome-utils/gnome-system-log-ja.omf share/gnome/omf/gnome-utils/gnome-system-log-ko.omf share/gnome/omf/gnome-utils/gnome-system-log-sv.omf +share/gnome/omf/gnome-utils/gnome-system-log-uk.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo @@ -168,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log/zh_TW @dirrm share/gnome/help/gnome-system-log/zh_CN/figures @dirrm share/gnome/help/gnome-system-log/zh_CN +@dirrm share/gnome/help/gnome-system-log/uk/figures +@dirrm share/gnome/help/gnome-system-log/uk @dirrm share/gnome/help/gnome-system-log/sv/figures @dirrm share/gnome/help/gnome-system-log/sv @dirrm share/gnome/help/gnome-system-log/ko/figures @@ -191,6 +209,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/zh_HK @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures @dirrm share/gnome/help/gnome-search-tool/zh_CN +@dirrm share/gnome/help/gnome-search-tool/uk/figures +@dirrm share/gnome/help/gnome-search-tool/uk @dirrm share/gnome/help/gnome-search-tool/sv/figures @dirrm share/gnome/help/gnome-search-tool/sv @dirrm share/gnome/help/gnome-search-tool/ko/figures @@ -206,9 +226,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/C/figures @dirrm share/gnome/help/gnome-search-tool/C @dirrm share/gnome/help/gnome-search-tool +@dirrm share/gnome/help/gnome-dictionary/uk/figures +@dirrm share/gnome/help/gnome-dictionary/uk @dirrm share/gnome/help/gnome-dictionary/ja/figures @dirrm share/gnome/help/gnome-dictionary/ja @dirrm share/gnome/help/gnome-dictionary/C/figures @dirrm share/gnome/help/gnome-dictionary/C @dirrm share/gnome/help/gnome-dictionary @dirrm share/gnome/gnome-system-log +@dirrm share/gnome/gnome-screenshot/glade +@dirrm share/gnome/gnome-screenshot diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 8f118a9f5748..d6e79dff9447 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomeutils2 -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-utils/2.8 +MASTER_SITE_SUBDIR= sources/gnome-utils/2.10 DISTNAME= gnome-utils-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -24,12 +23,21 @@ INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier gnomepanel +USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ + libgnomeprintui gnomedesktop USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1 -GCONF_SCHEMAS= gdict.schemas gnome-search-tool.schemas logview.schemas +GCONF_SCHEMAS= gdict.schemas gnome-screenshot.schemas \ + gnome-search-tool.schemas logview.schemas + +post-extract: + @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|
$$||g' + +post-patch: + @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index a5647e87561d..1e7ee27e21cb 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-utils-2.8.1.tar.bz2) = 048224275454781c7eebc5afd4004069 -SIZE (gnome2/gnome-utils-2.8.1.tar.bz2) = 1738576 +MD5 (gnome2/gnome-utils-2.10.0.tar.bz2) = 43644d28321645aa68428e99fadb2504 +SIZE (gnome2/gnome-utils-2.10.0.tar.bz2) = 2012166 diff --git a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c new file mode 100644 index 000000000000..0cc89594e169 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c @@ -0,0 +1,29 @@ +--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004 ++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004 +@@ -94,16 +94,20 @@ + gchar *message = NULL; + gchar *error_message = NULL; + GtkWidget *dialog; ++ GIOStatus status; + +- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); +- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); +- dialog = gtk_message_dialog_new (NULL, 0, ++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL); ++ if (status == G_IO_STATUS_NORMAL) ++ { ++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message); ++ dialog = gtk_message_dialog_new (NULL, 0, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_OK, + message); +- gtk_dialog_run (GTK_DIALOG (dialog)); +- gtk_widget_destroy (dialog); +- exit (1); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ exit (1); ++ } + } + + (*save_callback) (save_user_data); diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c new file mode 100644 index 000000000000..325e50a3548d --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-callbacks.c @@ -0,0 +1,29 @@ +--- gsearchtool/gsearchtool-callbacks.c.orig Thu Dec 23 19:14:17 2004 ++++ gsearchtool/gsearchtool-callbacks.c Thu Dec 23 19:15:55 2004 +@@ -54,9 +54,11 @@ + quit_application (GSearchCommandDetails * command_details) + { + if (command_details->command_status == RUNNING) { +- command_details->command_status = MAKE_IT_QUIT; + #ifdef HAVE_GETPGID + pid_t pgid; ++#endif ++ command_details->command_status = MAKE_IT_QUIT; ++#ifdef HAVE_GETPGID + + pgid = getpgid (command_details->command_pid); + +@@ -122,10 +124,12 @@ + GSearchWindow * gsearch = data; + + if (gsearch->command_details->command_status == RUNNING) { ++#ifdef HAVE_GETPGID ++ pid_t pgid; ++#endif + gtk_widget_set_sensitive (gsearch->stop_button, FALSE); + gsearch->command_details->command_status = MAKE_IT_STOP; + #ifdef HAVE_GETPGID +- pid_t pgid; + + pgid = getpgid (gsearch->command_details->command_pid); + diff --git a/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c new file mode 100644 index 000000000000..03a974c23aa4 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-gsearchtool_gsearchtool-support.c @@ -0,0 +1,10 @@ +--- gsearchtool/gsearchtool-support.c.orig Thu Dec 23 19:13:28 2004 ++++ gsearchtool/gsearchtool-support.c Thu Dec 23 19:13:38 2004 +@@ -30,6 +30,7 @@ + #endif + + #include <glib/gi18n.h> ++#include <sys/types.h> + #include <regex.h> + #include <gdk/gdkx.h> + #include <bonobo-activation/bonobo-activation.h> diff --git a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c b/deskutils/gnomeutils2/files/patch-logview::log_repaint.c deleted file mode 100644 index 3944b8205b12..000000000000 --- a/deskutils/gnomeutils2/files/patch-logview::log_repaint.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/log_repaint.c 2001/11/23 16:01:55 1.1 -+++ logview/log_repaint.c 2001/11/23 16:02:30 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include <gnome.h> - #include "logview.h" diff --git a/deskutils/gnomeutils2/files/patch-logview::logrtns.h b/deskutils/gnomeutils2/files/patch-logview::logrtns.h deleted file mode 100644 index a39ce6a77b82..000000000000 --- a/deskutils/gnomeutils2/files/patch-logview::logrtns.h +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- logview/logrtns.h 2001/11/23 16:04:00 1.1 -+++ logview/logrtns.h 2001/11/23 16:04:14 -@@ -24,7 +24,9 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#ifdef HAVE_MALLOC_H - #include <malloc.h> -+#endif - #include <string.h> - #include "logview.h" - diff --git a/deskutils/gnomeutils2/files/patch-logview_desc_db.c b/deskutils/gnomeutils2/files/patch-logview_desc_db.c new file mode 100644 index 000000000000..5b687f492e88 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_desc_db.c @@ -0,0 +1,10 @@ +--- logview/desc_db.c.orig Wed Dec 1 16:45:13 2004 ++++ logview/desc_db.c Wed Dec 1 16:45:25 2004 +@@ -21,6 +21,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include "logview.h" + #include "desc_db.h" diff --git a/deskutils/gnomeutils2/files/patch-logview_logview.c b/deskutils/gnomeutils2/files/patch-logview_logview.c index 942ed8a02d6b..4ac243d34e9a 100644 --- a/deskutils/gnomeutils2/files/patch-logview_logview.c +++ b/deskutils/gnomeutils2/files/patch-logview_logview.c @@ -1,37 +1,29 @@ ---- logview/logview.c.orig Fri May 7 21:47:59 2004 -+++ logview/logview.c Wed Aug 4 18:40:24 2004 -@@ -781,7 +781,7 @@ +--- logview/logview.c.orig Tue Nov 30 00:29:01 2004 ++++ logview/logview.c Tue Nov 30 00:30:44 2004 +@@ -656,7 +656,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-regexp.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-regexp.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->regexp_db_path); -@@ -804,7 +804,7 @@ +@@ -678,7 +678,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-descript.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-descript.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->descript_db_path); -@@ -838,7 +838,7 @@ +@@ -709,7 +709,7 @@ if ( ! found) { g_snprintf (full_name, sizeof (full_name), - "%s/share/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); -+ "%s/gnome-system-log/gnome-system-log-actions.db", DATADIR); ++ "%s/gnome-system-log/gnome-system-log-actions.db", LOGVIEWINSTALLPREFIX); if (access (full_name, R_OK) == 0) { found = TRUE; g_free (cfg->action_db_path); -@@ -922,6 +922,7 @@ - /* remove trailing newline */ - if (logfile[strlen(logfile)-1] == '\n') - logfile[strlen(logfile)-1] = '\0'; -+ if (strcmp (logfile, "/dev/console") == 0) continue; - fprintf(stderr, "Found a logfile: (%s)\n", logfile); - return logfile; - } diff --git a/deskutils/gnomeutils2/files/patch-logview_userprefs.c b/deskutils/gnomeutils2/files/patch-logview_userprefs.c new file mode 100644 index 000000000000..d93f8ae57fc2 --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-logview_userprefs.c @@ -0,0 +1,10 @@ +--- logview/userprefs.c.orig Tue Nov 30 00:35:05 2004 ++++ logview/userprefs.c Tue Nov 30 00:36:34 2004 +@@ -56,6 +56,7 @@ + /* remove trailing newline */ + if (logfile[strlen(logfile)-1] == '\n') + logfile[strlen(logfile)-1] = '\0'; ++ if (strcmp (logfile, "/dev/console") == 0) continue; + return logfile; + } + } diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index cc90083672a7..9bb821653750 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -1,4 +1,6 @@ bin/gnome-dictionary +bin/gnome-panel-screenshot +bin/gnome-screenshot bin/gnome-search-tool bin/gnome-system-log libdata/bonobo/servers/GNOME_GDictApplet.server @@ -7,6 +9,7 @@ share/gnome/applications/gnome-dictionary.desktop share/gnome/applications/gnome-search-tool.desktop share/gnome/applications/gnome-system-log.desktop share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml +share/gnome/gnome-screenshot/glade/gnome-screenshot.glade 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 @@ -18,6 +21,10 @@ share/gnome/help/gnome-dictionary/ja/figures/gdict_applet.png share/gnome/help/gnome-dictionary/ja/figures/gdict_window.png share/gnome/help/gnome-dictionary/ja/gnome-dictionary.xml share/gnome/help/gnome-dictionary/ja/legal.xml +share/gnome/help/gnome-dictionary/uk/figures/gdict_applet.png +share/gnome/help/gnome-dictionary/uk/figures/gdict_window.png +share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml +share/gnome/help/gnome-dictionary/uk/legal.xml share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml share/gnome/help/gnome-search-tool/C/legal.xml @@ -39,6 +46,9 @@ share/gnome/help/gnome-search-tool/ko/legal.xml share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/sv/gnome-search-tool.xml share/gnome/help/gnome-search-tool/sv/legal.xml +share/gnome/help/gnome-search-tool/uk/figures/gnome-search-tool_window.png +share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml +share/gnome/help/gnome-search-tool/uk/legal.xml share/gnome/help/gnome-search-tool/zh_CN/figures/gnome-search-tool_window.png share/gnome/help/gnome-search-tool/zh_CN/gnome-search-tool.xml share/gnome/help/gnome-search-tool/zh_CN/legal.xml @@ -72,6 +82,9 @@ share/gnome/help/gnome-system-log/ko/legal.xml share/gnome/help/gnome-system-log/sv/figures/syslog_window.png share/gnome/help/gnome-system-log/sv/gnome-system-log.xml share/gnome/help/gnome-system-log/sv/legal.xml +share/gnome/help/gnome-system-log/uk/figures/syslog_window.png +share/gnome/help/gnome-system-log/uk/gnome-system-log.xml +share/gnome/help/gnome-system-log/uk/legal.xml share/gnome/help/gnome-system-log/zh_CN/figures/syslog_window.png share/gnome/help/gnome-system-log/zh_CN/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_CN/legal.xml @@ -80,6 +93,7 @@ share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml share/gnome/help/gnome-system-log/zh_TW/legal.xml share/gnome/omf/gnome-utils/gnome-dictionary-C.omf share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf +share/gnome/omf/gnome-utils/gnome-dictionary-uk.omf share/gnome/omf/gnome-utils/gnome-search-tool-C.omf share/gnome/omf/gnome-utils/gnome-search-tool-es.omf share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf @@ -87,6 +101,7 @@ share/gnome/omf/gnome-utils/gnome-search-tool-it.omf share/gnome/omf/gnome-utils/gnome-search-tool-ja.omf share/gnome/omf/gnome-utils/gnome-search-tool-ko.omf share/gnome/omf/gnome-utils/gnome-search-tool-sv.omf +share/gnome/omf/gnome-utils/gnome-search-tool-uk.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_CN.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_HK.omf share/gnome/omf/gnome-utils/gnome-search-tool-zh_TW.omf @@ -98,6 +113,7 @@ share/gnome/omf/gnome-utils/gnome-system-log-it.omf share/gnome/omf/gnome-utils/gnome-system-log-ja.omf share/gnome/omf/gnome-utils/gnome-system-log-ko.omf share/gnome/omf/gnome-utils/gnome-system-log-sv.omf +share/gnome/omf/gnome-utils/gnome-system-log-uk.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo @@ -168,6 +184,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-system-log/zh_TW @dirrm share/gnome/help/gnome-system-log/zh_CN/figures @dirrm share/gnome/help/gnome-system-log/zh_CN +@dirrm share/gnome/help/gnome-system-log/uk/figures +@dirrm share/gnome/help/gnome-system-log/uk @dirrm share/gnome/help/gnome-system-log/sv/figures @dirrm share/gnome/help/gnome-system-log/sv @dirrm share/gnome/help/gnome-system-log/ko/figures @@ -191,6 +209,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/zh_HK @dirrm share/gnome/help/gnome-search-tool/zh_CN/figures @dirrm share/gnome/help/gnome-search-tool/zh_CN +@dirrm share/gnome/help/gnome-search-tool/uk/figures +@dirrm share/gnome/help/gnome-search-tool/uk @dirrm share/gnome/help/gnome-search-tool/sv/figures @dirrm share/gnome/help/gnome-search-tool/sv @dirrm share/gnome/help/gnome-search-tool/ko/figures @@ -206,9 +226,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo @dirrm share/gnome/help/gnome-search-tool/C/figures @dirrm share/gnome/help/gnome-search-tool/C @dirrm share/gnome/help/gnome-search-tool +@dirrm share/gnome/help/gnome-dictionary/uk/figures +@dirrm share/gnome/help/gnome-dictionary/uk @dirrm share/gnome/help/gnome-dictionary/ja/figures @dirrm share/gnome/help/gnome-dictionary/ja @dirrm share/gnome/help/gnome-dictionary/C/figures @dirrm share/gnome/help/gnome-dictionary/C @dirrm share/gnome/help/gnome-dictionary @dirrm share/gnome/gnome-system-log +@dirrm share/gnome/gnome-screenshot/glade +@dirrm share/gnome/gnome-screenshot diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index f06ccc438678..ae4b62d0e793 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -6,32 +6,36 @@ # PORTNAME= bugbuddy -PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils + USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ + desktopfileutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index 0b776637feb8..d7003e3d31ca 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea -SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 +MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac +SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 diff --git a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf deleted file mode 100644 index 1388788efaf5..000000000000 --- a/devel/bug-buddy/files/patch-docs_C_bug-buddy-C.omf +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004 -+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004 -@@ -3,8 +3,8 @@ - <resource> - <creator>baudais@kkpsi.org (Eric Baudais)</creator> - <creator>telsa@linuxchix.org (Telsa Gwynne)</creator> -- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer> -+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <title>Bug Buddy Manual</title> - <date>September 11, 2004</date> - <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/> diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in new file mode 100644 index 000000000000..1074dd7520d2 --- /dev/null +++ b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in @@ -0,0 +1,12 @@ +--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 ++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 +@@ -0,0 +1,9 @@ ++<?xml version="1.0" standalone="no"?> ++<omf> ++ <resource> ++ <subject category="GNOME|Development"/> ++ <type>user's guide</type> ++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> ++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> ++ </resource> ++</omf> diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c new file mode 100644 index 000000000000..bc0a6ba22c2f --- /dev/null +++ b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c @@ -0,0 +1,10 @@ +--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 ++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 +@@ -36,6 +36,7 @@ + #include <sys/types.h> + #include <sysexits.h> + #include <sys/wait.h> ++#include <signal.h> + + #if 0 + static char *help_pages[] = { diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist index cd4e2b3e301c..16d22f537467 100644 --- a/devel/bug-buddy/pkg-plist +++ b/devel/bug-buddy/pkg-plist @@ -1,8 +1,8 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -share/gnome/applications/bug-buddy.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png share/gnome/bug-buddy/bugzilla/gnome.bugzilla @@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo +share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index f06ccc438678..ae4b62d0e793 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -6,32 +6,36 @@ # PORTNAME= bugbuddy -PORTVERSION= 2.8.0 -PORTREVISION= 3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/bug-buddy/2.8 +MASTER_SITE_SUBDIR= sources/bug-buddy/2.10 DISTNAME= bug-buddy-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A bug reporting tool for GNOME 2 +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils + USE_BZIP2= yes USE_X_PREFIX= yes INSTALLS_OMF= yes USE_REINPLACE= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \ + desktopfileutils GNOME_DESKTOP_VERSION=2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --with-help-dir=${PREFIX}/share/gnome/help MAN1= bug-buddy.1 GCONF_SCHEMAS= bug-buddy.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index 0b776637feb8..d7003e3d31ca 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/bug-buddy-2.8.0.tar.bz2) = b4c90bb9e1762803d083026b000349ea -SIZE (gnome2/bug-buddy-2.8.0.tar.bz2) = 711303 +MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac +SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182 diff --git a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf b/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf deleted file mode 100644 index 1388788efaf5..000000000000 --- a/devel/bugbuddy/files/patch-docs_C_bug-buddy-C.omf +++ /dev/null @@ -1,12 +0,0 @@ ---- docs/C/bug-buddy-C.omf.orig Tue Nov 9 21:19:52 2004 -+++ docs/C/bug-buddy-C.omf Tue Nov 9 21:19:57 2004 -@@ -3,8 +3,8 @@ - <resource> - <creator>baudais@kkpsi.org (Eric Baudais)</creator> - <creator>telsa@linuxchix.org (Telsa Gwynne)</creator> -- <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <maintainer>docs@gnome.org (GNOME Documentation Project)</maintainer> -+ <contributor>kevin@kevindumpscore.com (Kevin Conder)</contributor> - <title>Bug Buddy Manual</title> - <date>September 11, 2004</date> - <version identifier="2.8" date="2004-09-11" description="Updated to bug buddy 2.8"/> diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in new file mode 100644 index 000000000000..1074dd7520d2 --- /dev/null +++ b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in @@ -0,0 +1,12 @@ +--- docs/bug-buddy.omf.in.orig Fri Feb 11 14:23:02 2005 ++++ docs/bug-buddy.omf.in Fri Feb 11 14:22:48 2005 +@@ -0,0 +1,9 @@ ++<?xml version="1.0" standalone="no"?> ++<omf> ++ <resource> ++ <subject category="GNOME|Development"/> ++ <type>user's guide</type> ++ <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/> ++ <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/> ++ </resource> ++</omf> diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c new file mode 100644 index 000000000000..bc0a6ba22c2f --- /dev/null +++ b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c @@ -0,0 +1,10 @@ +--- src/united-states-of-bug-buddy.c.orig Tue Nov 30 18:21:10 2004 ++++ src/united-states-of-bug-buddy.c Tue Nov 30 18:21:15 2004 +@@ -36,6 +36,7 @@ + #include <sys/types.h> + #include <sysexits.h> + #include <sys/wait.h> ++#include <signal.h> + + #if 0 + static char *help_pages[] = { diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist index cd4e2b3e301c..16d22f537467 100644 --- a/devel/bugbuddy/pkg-plist +++ b/devel/bugbuddy/pkg-plist @@ -1,8 +1,8 @@ bin/bug-buddy share/gnome/application-registry/bug-buddy.applications share/gnome/applications/bug-buddy-core.desktop -share/gnome/applications/bug-buddy.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/applications/bug-buddy.desktop share/gnome/bug-buddy/bug-buddy.glade share/gnome/bug-buddy/bug-buddy.png share/gnome/bug-buddy/bugzilla/gnome.bugzilla @@ -61,6 +61,7 @@ share/locale/ml/LC_MESSAGES/bug-buddy.mo share/locale/mn/LC_MESSAGES/bug-buddy.mo share/locale/ms/LC_MESSAGES/bug-buddy.mo share/locale/nb/LC_MESSAGES/bug-buddy.mo +share/locale/ne/LC_MESSAGES/bug-buddy.mo share/locale/nl/LC_MESSAGES/bug-buddy.mo share/locale/nn/LC_MESSAGES/bug-buddy.mo share/locale/no/LC_MESSAGES/bug-buddy.mo diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index de9618dd1fcd..95438dda0a76 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gconf2 -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/GConf/2.8 +MASTER_SITE_SUBDIR= sources/GConf/2.10 DISTNAME= GConf-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +19,7 @@ COMMENT= A configuration database system for GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomehack gnomehier orbit2 gtk20 libxml2 linc +USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 linc INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index aca3f01b6deb..cea5ecfa28cf 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.8.1.tar.bz2) = b1173cbe33404bcbcc15710ce2a28f67 -SIZE (gnome2/GConf-2.8.1.tar.bz2) = 1730812 +MD5 (gnome2/GConf-2.10.0.tar.bz2) = a7cd37be4e317195a6668a086fc72033 +SIZE (gnome2/GConf-2.10.0.tar.bz2) = 1734260 diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist index eb4b1a71a6a9..279911c02104 100644 --- a/devel/gconf2/pkg-plist +++ b/devel/gconf2/pkg-plist @@ -56,6 +56,7 @@ share/locale/el/LC_MESSAGES/GConf2.mo share/locale/en_CA/LC_MESSAGES/GConf2.mo share/locale/en_GB/LC_MESSAGES/GConf2.mo share/locale/es/LC_MESSAGES/GConf2.mo +share/locale/et/LC_MESSAGES/GConf2.mo share/locale/eu/LC_MESSAGES/GConf2.mo share/locale/fa/LC_MESSAGES/GConf2.mo share/locale/fi/LC_MESSAGES/GConf2.mo @@ -97,6 +98,7 @@ share/locale/ta/LC_MESSAGES/GConf2.mo share/locale/tr/LC_MESSAGES/GConf2.mo share/locale/uk/LC_MESSAGES/GConf2.mo share/locale/vi/LC_MESSAGES/GConf2.mo +share/locale/xh/LC_MESSAGES/GConf2.mo share/locale/yi/LC_MESSAGES/GConf2.mo share/locale/zh_CN/LC_MESSAGES/GConf2.mo share/locale/zh_TW/LC_MESSAGES/GConf2.mo diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 1b2a139341b9..a6d5ad9a05f5 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -6,10 +6,11 @@ # PORTNAME= glib -PORTVERSION= 2.4.8 +PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ @@ -38,4 +39,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 600012 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gthread_gthread-posix.c +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ + s|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/glib/gutils.c + +.include <bsd.port.post.mk> diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo index da94272ac8f6..0d5183d695b5 100644 --- a/devel/glib20/distinfo +++ b/devel/glib20/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/glib-2.4.8.tar.bz2) = e160a5feecf46e0fbb36db09c356953c -SIZE (gnome2/glib-2.4.8.tar.bz2) = 2152755 +MD5 (gnome2/glib-2.6.3.tar.bz2) = 8f69ad5387197114b356efc64ce88d77 +SIZE (gnome2/glib-2.6.3.tar.bz2) = 2300144 diff --git a/devel/glib20/files/extra-patch-gthread_gthread-posix.c b/devel/glib20/files/extra-patch-gthread_gthread-posix.c new file mode 100644 index 000000000000..8796dd629960 --- /dev/null +++ b/devel/glib20/files/extra-patch-gthread_gthread-posix.c @@ -0,0 +1,32 @@ +--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 ++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 +@@ -115,7 +115,11 @@ + # define PRIORITY_NORMAL_VALUE priority_normal_value + #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ + ++#define G_THREAD_STACK_SIZE32 (1*1024*1024) ++#define G_THREAD_STACK_SIZE64 (2*1024*1024) ++ + static gulong g_thread_min_stack_size = 0; ++static gulong g_thread_default_stack_size = 0; + + #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) + +@@ -307,8 +312,16 @@ + if (stack_size) + { + stack_size = MAX (g_thread_min_stack_size, stack_size); +- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); + } ++ else ++ { ++ if (sizeof(void *) == 8) ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE64; ++ else ++ g_thread_default_stack_size = G_THREAD_STACK_SIZE32; ++ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); ++ } ++ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); + #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ + + #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c new file mode 100644 index 000000000000..d32b910ad8ca --- /dev/null +++ b/devel/glib20/files/patch-glib_gutils.c @@ -0,0 +1,20 @@ +--- glib/gutils.c.orig Sat Sep 4 15:49:27 2004 ++++ glib/gutils.c Sat Sep 4 15:55:24 2004 +@@ -1466,7 +1466,7 @@ + data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); + + if (!data_dirs || !data_dirs[0]) +- data_dirs = "/usr/local/share/:/usr/share/"; ++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + #endif + data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); + +@@ -1509,7 +1509,7 @@ + conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); + + if (!conf_dirs || !conf_dirs[0]) +- conf_dirs = "/etc/xdg"; ++ conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg"; + #endif + conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); + } diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c index bdf24590d4cc..47c5ab8f1591 100644 --- a/devel/glib20/files/patch-gthread_gthread-posix.c +++ b/devel/glib20/files/patch-gthread_gthread-posix.c @@ -1,15 +1,7 @@ ---- gthread/gthread-posix.c.orig Tue Sep 7 17:57:53 2004 -+++ gthread/gthread-posix.c Tue Sep 7 17:58:30 2004 -@@ -116,6 +116,7 @@ - #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ - - static gulong g_thread_min_stack_size = 0; -+static gulong g_thread_default_stack_size = 0x100000; - - #define G_MUTEX_SIZE (sizeof (pthread_mutex_t)) - -@@ -125,7 +126,8 @@ - g_thread_impl_init() +--- gthread/gthread-posix.c.orig Mon Nov 1 13:47:12 2004 ++++ gthread/gthread-posix.c Wed Mar 9 14:21:20 2005 +@@ -125,7 +129,8 @@ + g_thread_impl_init(void) { #ifdef _SC_THREAD_STACK_MIN - g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0); @@ -18,7 +10,7 @@ #endif /* _SC_THREAD_STACK_MIN */ #ifdef HAVE_PRIORITIES # ifdef G_THREADS_IMPL_POSIX -@@ -176,7 +178,7 @@ +@@ -176,7 +181,7 @@ result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); #ifdef G_THREADS_IMPL_POSIX @@ -27,17 +19,3 @@ return FALSE; #else /* G_THREADS_IMPL_DCE */ if (result == 0) -@@ -307,8 +309,12 @@ - if (stack_size) - { - stack_size = MAX (g_thread_min_stack_size, stack_size); -- posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); - } -+ else -+ { -+ stack_size = MAX (g_thread_min_stack_size, g_thread_default_stack_size); -+ } -+ posix_check_cmd (pthread_attr_setstacksize (&attr, stack_size)); - #endif /* HAVE_PTHREAD_ATTR_SETSTACKSIZE */ - - #ifdef PTHREAD_SCOPE_SYSTEM diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist index 5a7533881bfe..5bebbaa72a30 100644 --- a/devel/glib20/pkg-plist +++ b/devel/glib20/pkg-plist @@ -22,6 +22,7 @@ include/glib-2.0/glib/ghook.h include/glib-2.0/glib/gi18n-lib.h include/glib-2.0/glib/gi18n.h include/glib-2.0/glib/giochannel.h +include/glib-2.0/glib/gkeyfile.h include/glib-2.0/glib/glist.h include/glib-2.0/glib/gmacros.h include/glib-2.0/glib/gmain.h @@ -29,6 +30,7 @@ include/glib-2.0/glib/gmarkup.h include/glib-2.0/glib/gmem.h include/glib-2.0/glib/gmessages.h include/glib-2.0/glib/gnode.h +include/glib-2.0/glib/goption.h include/glib-2.0/glib/gpattern.h include/glib-2.0/glib/gprimes.h include/glib-2.0/glib/gprintf.h @@ -41,6 +43,7 @@ include/glib-2.0/glib/gscanner.h include/glib-2.0/glib/gshell.h include/glib-2.0/glib/gslist.h include/glib-2.0/glib/gspawn.h +include/glib-2.0/glib/gstdio.h include/glib-2.0/glib/gstrfuncs.h include/glib-2.0/glib/gstring.h include/glib-2.0/glib/gthread.h @@ -72,18 +75,19 @@ 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.400 +lib/libglib-2.0.so.600 lib/libgmodule-2.0.a lib/libgmodule-2.0.so -lib/libgmodule-2.0.so.400 +lib/libgmodule-2.0.so.600 lib/libgobject-2.0.a lib/libgobject-2.0.so -lib/libgobject-2.0.so.400 +lib/libgobject-2.0.so.600 lib/libgthread-2.0.a lib/libgthread-2.0.so -lib/libgthread-2.0.so.400 +lib/libgthread-2.0.so.600 libdata/pkgconfig/glib-2.0.pc libdata/pkgconfig/gmodule-2.0.pc +libdata/pkgconfig/gmodule-no-export-2.0.pc libdata/pkgconfig/gobject-2.0.pc libdata/pkgconfig/gthread-2.0.pc share/aclocal/glib-2.0.m4 @@ -148,10 +152,12 @@ share/locale/sr@Latn/LC_MESSAGES/glib20.mo share/locale/sr@ije/LC_MESSAGES/glib20.mo share/locale/sv/LC_MESSAGES/glib20.mo share/locale/ta/LC_MESSAGES/glib20.mo +share/locale/tl/LC_MESSAGES/glib20.mo share/locale/tr/LC_MESSAGES/glib20.mo share/locale/uk/LC_MESSAGES/glib20.mo share/locale/vi/LC_MESSAGES/glib20.mo share/locale/wa/LC_MESSAGES/glib20.mo +share/locale/xh/LC_MESSAGES/glib20.mo share/locale/yi/LC_MESSAGES/glib20.mo share/locale/zh_CN/LC_MESSAGES/glib20.mo share/locale/zh_TW/LC_MESSAGES/glib20.mo @@ -159,6 +165,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo @unexec rmdir %D/share/locale/ne 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true +@unexec rmdir %D/share/locale/tl/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/tl 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true @dirrm share/glib-2.0/gettext/po diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index a562cf3b8fe9..d5535b85750e 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes USE_LIBTOOL_VER=15 @@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on - .include <bsd.port.pre.mk> .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) @@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif -.if !defined(WITHOUT_KDE_MENUS) -EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in -PLIST_SUB+= KDEMENUS="" -.else -PLIST_SUB+= KDEMENUS="@comment " -.endif - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif @@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl .endif post-patch: - @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in + ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c -.if !defined(WITHOUT_KDE_MENUS) - @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ - < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory -.endif - @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ - ${WRKSRC}/Makefile.in @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ @@ -127,9 +108,5 @@ pre-configure: post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(WITHOUT_KDE_MENUS) - @${MKDIR} ${PREFIX}/share/gnome/vfolders - @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders -.endif .include <bsd.port.post.mk> diff --git a/devel/gnome-vfs/distinfo b/devel/gnome-vfs/distinfo index 505711b7dcbe..3bb839cef2ec 100644 --- a/devel/gnome-vfs/distinfo +++ b/devel/gnome-vfs/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34 -SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413 +MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97 +SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027 diff --git a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 120a8906411f..000000000000 --- a/devel/gnome-vfs/files/modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,285 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 -@@ -19,7 +19,14 @@ - <MergeDir>/usr/share/gnome/apps/</MergeDir> - - <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> - - <!-- Root folder --> - <Folder> -@@ -34,10 +41,12 @@ - <Query> - <And> - <Keyword>Core</Keyword> -- <!-- FIXME: Seth, why would this be wanted? --> -- <!--<Not> -- <Keyword>Merged</Keyword> -- </Not>--> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - </And> - </Query> - -@@ -47,6 +56,12 @@ - <Desktop>Accessories.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Utility</Keyword> - <Not> -@@ -63,6 +78,12 @@ - <Desktop>Accessibility.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Accessibility</Keyword> - <Not> -@@ -80,6 +101,12 @@ - <OnlyUnallocated/> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -101,6 +128,12 @@ - <Desktop>Development.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Development</Keyword> - </And> -@@ -114,6 +147,12 @@ - <Desktop>Games.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Game</Keyword> - </And> -@@ -127,6 +166,12 @@ - <Desktop>Graphics.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Graphics</Keyword> - </And> -@@ -140,6 +185,12 @@ - <Desktop>Internet.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Network</Keyword> - </And> -@@ -153,6 +204,12 @@ - <Desktop>Multimedia.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>AudioVideo</Keyword> - </And> -@@ -170,6 +227,12 @@ - <Desktop>Office.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Or> - <Keyword>Office</Keyword> -@@ -195,6 +258,12 @@ - <Desktop>System.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -204,6 +273,118 @@ - </Query> - <DontShowIfEmpty/> - </Folder> -- -+ -+ <!-- KDE --> -+ <Folder> -+ <Name>KDE</Name> -+ <Desktop>KDE.directory</Desktop> -+ -+ <!-- KAccessories --> -+ <Folder> -+ <Name>Accessories</Name> -+ <Desktop>Accessories.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Utility</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KDevelopment Tools --> -+ <Folder> -+ <Name>Programming</Name> -+ <Desktop>Development.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Development</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KGraphics --> -+ <Folder> -+ <Name>Graphics</Name> -+ <Desktop>Graphics.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Graphics</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KInternet --> -+ <Folder> -+ <Name>Internet</Name> -+ <Desktop>Internet.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Network</Keyword> -+ </And> -+ </Query> -+ -+ <Include>/usr/local/share/applnk/konqueror.desktop</Include> -+ -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KMultimedia --> -+ <Folder> -+ <Name>Multimedia</Name> -+ <Desktop>Multimedia.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>AudioVideo</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KOffice --> -+ <Folder> -+ <Name>Office</Name> -+ <Desktop>Office.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Or> -+ <Keyword>Office</Keyword> -+ <Keyword>Spreadsheet</Keyword> -+ <Keyword>WordProcessor</Keyword> -+ <Keyword>Calendar</Keyword> -+ <Keyword>ProjectManagement</Keyword> -+ </Or> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ <DontShowIfEmpty/> -+ </Folder> <!-- KDE --> -+ - </Folder> - </VFolderInfo> diff --git a/devel/gnome-vfs/files/patch-Makefile.in b/devel/gnome-vfs/files/patch-Makefile.in new file mode 100644 index 000000000000..8c0d2a13160c --- /dev/null +++ b/devel/gnome-vfs/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Nov 30 02:05:26 2004 ++++ Makefile.in Tue Nov 30 02:05:34 2004 +@@ -230,7 +230,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po + diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c deleted file mode 100644 index 82e0e5f61891..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_eggdirfuncs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 -+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 -@@ -106,7 +106,7 @@ - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; - - data_dir_vector = g_strsplit (data_dirs, ":", 0); - diff --git a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 5d37cc768ddb..000000000000 --- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 -@@ -43,6 +43,7 @@ - #include <errno.h> - #include <string.h> - #include <signal.h> -+#include <poll.h> - #include <libgnomevfs/gnome-vfs.h> - - #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnome-vfs/files/patch-modules_smb-method.c b/devel/gnome-vfs/files/patch-modules_smb-method.c new file mode 100644 index 000000000000..9c7cb9232cab --- /dev/null +++ b/devel/gnome-vfs/files/patch-modules_smb-method.c @@ -0,0 +1,11 @@ +--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 ++++ modules/smb-method.c Tue Jan 11 18:25:03 2005 +@@ -1345,7 +1345,7 @@ + GnomeVFSContext *context) + { + FileHandle *handle = (FileHandle *)method_handle; +- GnomeVFSResult res = GNOME_VFS_OK;; ++ GnomeVFSResult res = GNOME_VFS_OK; + SmbAuthContext actx; + ssize_t n = 0; + diff --git a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c b/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c deleted file mode 100644 index a07d0bc81b39..000000000000 --- a/devel/gnome-vfs/files/patch-modules_vfolder_vfolder-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 c594e7a9483b..2540d81f57e7 100644 --- a/devel/gnome-vfs/pkg-plist +++ b/devel/gnome-vfs/pkg-plist @@ -3,18 +3,12 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-mv bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-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-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h @@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h @@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.800 +lib/libgnomevfs-2.so.1000 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc @@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html @@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/networking.html share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css share/doc/gnome-vfs-2.0/up.png share/doc/gnome-vfs-2.0/volumes.html -%%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/yi/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 share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/doc/gnome-vfs-2.0 @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 +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile index 6986ce0c5971..36a002449cfa 100644 --- a/devel/gnome-vfsmm/Makefile +++ b/devel/gnome-vfsmm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome-vfsmm -PORTVERSION= 2.6.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -23,8 +22,8 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GCC= 3.4 USE_GMAKE= yes -USE_GNOME= gnomehack lthack gnomevfs2 -USE_INC_LIBTOOL_VER=13 +USE_GNOME= gnomehack gnomevfs2 +USE_INC_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-static @@ -34,4 +33,13 @@ post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \ ${WRKSRC}/Makefile.in +patch-autotools: + @(cd ${PATCH_WRKSRC}; \ + for file in ${LIBTOOLFILES}; do \ + ${CP} $$file $$file.tmp; \ + ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \ + $$file.tmp > $$file; \ + ${RM} $$file.tmp; \ + done); + .include <bsd.port.mk> diff --git a/devel/gnome-vfsmm/distinfo b/devel/gnome-vfsmm/distinfo index 821085698be8..00edc798d38f 100644 --- a/devel/gnome-vfsmm/distinfo +++ b/devel/gnome-vfsmm/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = a0f8006f7336b211f160224fddaf86e1 -SIZE (gnome2/gnome-vfsmm-2.6.1.tar.bz2) = 290073 +MD5 (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 0d5751f1c0074289c3e6a858357f9c4d +SIZE (gnome2/gnome-vfsmm-2.10.0.tar.bz2) = 317394 diff --git a/devel/gnome-vfsmm/pkg-plist b/devel/gnome-vfsmm/pkg-plist index 39b64f3674b2..4fee1a3e7c83 100644 --- a/devel/gnome-vfsmm/pkg-plist +++ b/devel/gnome-vfsmm/pkg-plist @@ -1,8 +1,10 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/address.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/application-registry.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/async.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/directory-handle.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/dns-sd.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/drive.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/enums.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/exception.h @@ -15,6 +17,7 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-handlers.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/mime-monitor.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/monitor-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/address_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/async-handle_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/drive_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/enums_p.h @@ -22,10 +25,12 @@ include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/file-info_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-action_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-application_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/mime-monitor_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/resolve-handle_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/transfer-progress_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/uri_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume-monitor_p.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/private/volume_p.h +include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/resolve-handle.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer-progress.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/transfer.h include/gnome-vfsmm-%%API_VERSION%%/libgnomevfsmm/types.h diff --git a/devel/gnome2-hacker-tools/Makefile b/devel/gnome2-hacker-tools/Makefile index c42039ec40a4..cc87b3cc7f94 100644 --- a/devel/gnome2-hacker-tools/Makefile +++ b/devel/gnome2-hacker-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-hacker-tools -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile index a562cf3b8fe9..d5535b85750e 100644 --- a/devel/gnomevfs2/Makefile +++ b/devel/gnomevfs2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomevfs2 -PORTVERSION= 2.8.4 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-vfs/2.8 +MASTER_SITE_SUBDIR= sources/gnome-vfs/2.10 DISTNAME= gnome-vfs-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \ +USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ libbonobo USE_REINPLACE= yes USE_LIBTOOL_VER=15 @@ -39,8 +39,6 @@ GCONF_SCHEMAS= desktop_default_applications.schemas \ desktop_gnome_url_handlers.schemas system_dns_sd.schemas \ system_http_proxy.schemas system_smb.schemas -OPTIONS= KDE_MENUS "Integrated KDE menu picks" on - .include <bsd.port.pre.mk> .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) @@ -52,13 +50,6 @@ WITH_CDPARANOIA= yes WITH_SAMBA= yes .endif -.if !defined(WITHOUT_KDE_MENUS) -EXTRA_PATCHES= ${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in -PLIST_SUB+= KDEMENUS="" -.else -PLIST_SUB+= KDEMENUS="@comment " -.endif - .if exists(${LOCALBASE}/lib/libcdda_paranoia.a) WITH_CDPARANOIA= yes .endif @@ -98,22 +89,12 @@ LIB_DEPENDS+= howl:${PORTSDIR}/net/howl .endif post-patch: - @${FIND} ${WRKSRC} -name "*info.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|\@datadir\@/gnome|\@datadir\@|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ - ${WRKSRC}/libgnomevfs/Makefile.in \ - ${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in + ${WRKSRC}/libgnomevfs/Makefile.in @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ ${WRKSRC}/libgnomevfs/xdgmime.c \ - ${WRKSRC}/libgnomevfs/eggdirfuncs.c \ ${WRKSRC}/libgnomevfs/gnome-vfs-mime-info.c -.if !defined(WITHOUT_KDE_MENUS) - @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ - < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory -.endif - @${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \ - ${WRKSRC}/Makefile.in @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ @@ -127,9 +108,5 @@ pre-configure: post-install: @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.if !defined(WITHOUT_KDE_MENUS) - @${MKDIR} ${PREFIX}/share/gnome/vfolders - @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders -.endif .include <bsd.port.post.mk> diff --git a/devel/gnomevfs2/distinfo b/devel/gnomevfs2/distinfo index 505711b7dcbe..3bb839cef2ec 100644 --- a/devel/gnomevfs2/distinfo +++ b/devel/gnomevfs2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-vfs-2.8.4.tar.bz2) = 42d3505e9ef9c26a7aae4e511b9b4c34 -SIZE (gnome2/gnome-vfs-2.8.4.tar.bz2) = 1892413 +MD5 (gnome2/gnome-vfs-2.10.0.tar.bz2) = bb9df65d6a77414bbde9f1bc429c9d97 +SIZE (gnome2/gnome-vfs-2.10.0.tar.bz2) = 1901027 diff --git a/devel/gnomevfs2/files/KDE.directory b/devel/gnomevfs2/files/KDE.directory deleted file mode 100644 index 032126bb99db..000000000000 --- a/devel/gnomevfs2/files/KDE.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Name=KDE -Comment=Some comment about KDE menu -Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png -Type=Directory diff --git a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in b/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in deleted file mode 100644 index 120a8906411f..000000000000 --- a/devel/gnomevfs2/files/modules_vfolder_applications-all-users.vfolder-info.in +++ /dev/null @@ -1,285 +0,0 @@ ---- modules/vfolder/applications-all-users.vfolder-info.in.orig Fri Oct 17 10:11:22 2003 -+++ modules/vfolder/applications-all-users.vfolder-info.in Thu Feb 12 15:15:40 2004 -@@ -19,7 +19,14 @@ - <MergeDir>/usr/share/gnome/apps/</MergeDir> - - <!-- Merge dirs optional --> -- <MergeDir>/etc/X11/applnk/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Toys/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Utilities/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Internet/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Office/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Applications/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Development/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Games/</MergeDir> -+ <MergeDir>/usr/local/share/applnk/Multimedia/</MergeDir> - - <!-- Root folder --> - <Folder> -@@ -34,10 +41,12 @@ - <Query> - <And> - <Keyword>Core</Keyword> -- <!-- FIXME: Seth, why would this be wanted? --> -- <!--<Not> -- <Keyword>Merged</Keyword> -- </Not>--> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - </And> - </Query> - -@@ -47,6 +56,12 @@ - <Desktop>Accessories.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Utility</Keyword> - <Not> -@@ -63,6 +78,12 @@ - <Desktop>Accessibility.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Accessibility</Keyword> - <Not> -@@ -80,6 +101,12 @@ - <OnlyUnallocated/> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -101,6 +128,12 @@ - <Desktop>Development.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Development</Keyword> - </And> -@@ -114,6 +147,12 @@ - <Desktop>Games.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Game</Keyword> - </And> -@@ -127,6 +166,12 @@ - <Desktop>Graphics.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Graphics</Keyword> - </And> -@@ -140,6 +185,12 @@ - <Desktop>Internet.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>Network</Keyword> - </And> -@@ -153,6 +204,12 @@ - <Desktop>Multimedia.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Keyword>AudioVideo</Keyword> - </And> -@@ -170,6 +227,12 @@ - <Desktop>Office.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Or> - <Keyword>Office</Keyword> -@@ -195,6 +258,12 @@ - <Desktop>System.directory</Desktop> - <Query> - <And> -+ <Not> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ </Not> - <Keyword>Application</Keyword> - <Not> - <Keyword>Settings</Keyword> -@@ -204,6 +273,118 @@ - </Query> - <DontShowIfEmpty/> - </Folder> -- -+ -+ <!-- KDE --> -+ <Folder> -+ <Name>KDE</Name> -+ <Desktop>KDE.directory</Desktop> -+ -+ <!-- KAccessories --> -+ <Folder> -+ <Name>Accessories</Name> -+ <Desktop>Accessories.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Utility</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KDevelopment Tools --> -+ <Folder> -+ <Name>Programming</Name> -+ <Desktop>Development.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Development</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KGraphics --> -+ <Folder> -+ <Name>Graphics</Name> -+ <Desktop>Graphics.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Graphics</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KInternet --> -+ <Folder> -+ <Name>Internet</Name> -+ <Desktop>Internet.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>Network</Keyword> -+ </And> -+ </Query> -+ -+ <Include>/usr/local/share/applnk/konqueror.desktop</Include> -+ -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KMultimedia --> -+ <Folder> -+ <Name>Multimedia</Name> -+ <Desktop>Multimedia.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Keyword>AudioVideo</Keyword> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ -+ <!-- KOffice --> -+ <Folder> -+ <Name>Office</Name> -+ <Desktop>Office.directory</Desktop> -+ <Query> -+ <And> -+ <Or> -+ <Keyword>Qt</Keyword> -+ <Keyword>KDE</Keyword> -+ </Or> -+ <Or> -+ <Keyword>Office</Keyword> -+ <Keyword>Spreadsheet</Keyword> -+ <Keyword>WordProcessor</Keyword> -+ <Keyword>Calendar</Keyword> -+ <Keyword>ProjectManagement</Keyword> -+ </Or> -+ </And> -+ </Query> -+ <DontShowIfEmpty/> -+ </Folder> -+ <DontShowIfEmpty/> -+ </Folder> <!-- KDE --> -+ - </Folder> - </VFolderInfo> diff --git a/devel/gnomevfs2/files/patch-Makefile.in b/devel/gnomevfs2/files/patch-Makefile.in new file mode 100644 index 000000000000..8c0d2a13160c --- /dev/null +++ b/devel/gnomevfs2/files/patch-Makefile.in @@ -0,0 +1,10 @@ +--- Makefile.in.orig Tue Nov 30 02:05:26 2004 ++++ Makefile.in Tue Nov 30 02:05:34 2004 +@@ -230,7 +230,6 @@ + devel-docs \ + doc \ + programs \ +- test \ + monikers \ + po + diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c b/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c deleted file mode 100644 index 82e0e5f61891..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_eggdirfuncs.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomevfs/eggdirfuncs.c.orig Sat Jul 24 03:08:10 2004 -+++ libgnomevfs/eggdirfuncs.c Sat Jul 24 03:08:50 2004 -@@ -106,7 +106,7 @@ - data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); - - if (!data_dirs || !data_dirs[0]) -- data_dirs = "/usr/local/share/:/usr/share/"; -+ data_dirs = "/usr/local/share/:%%X11BASE%%/share/:/usr/share/:/usr/local/share/gnome/:%%X11BASE%%/share/gnome/:/usr/share/gnome/"; - - data_dir_vector = g_strsplit (data_dirs, ":", 0); - diff --git a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c deleted file mode 100644 index 5d37cc768ddb..000000000000 --- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-unix-mounts.c +++ /dev/null @@ -1,10 +0,0 @@ ---- libgnomevfs/gnome-vfs-unix-mounts.c.orig Sun Sep 5 02:34:30 2004 -+++ libgnomevfs/gnome-vfs-unix-mounts.c Sun Sep 5 02:35:08 2004 -@@ -43,6 +43,7 @@ - #include <errno.h> - #include <string.h> - #include <signal.h> -+#include <poll.h> - #include <libgnomevfs/gnome-vfs.h> - - #include "gnome-vfs-unix-mounts.h" diff --git a/devel/gnomevfs2/files/patch-modules_smb-method.c b/devel/gnomevfs2/files/patch-modules_smb-method.c new file mode 100644 index 000000000000..9c7cb9232cab --- /dev/null +++ b/devel/gnomevfs2/files/patch-modules_smb-method.c @@ -0,0 +1,11 @@ +--- modules/smb-method.c.orig Tue Jan 11 18:24:53 2005 ++++ modules/smb-method.c Tue Jan 11 18:25:03 2005 +@@ -1345,7 +1345,7 @@ + GnomeVFSContext *context) + { + FileHandle *handle = (FileHandle *)method_handle; +- GnomeVFSResult res = GNOME_VFS_OK;; ++ GnomeVFSResult res = GNOME_VFS_OK; + SmbAuthContext actx; + ssize_t n = 0; + diff --git a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c b/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c deleted file mode 100644 index a07d0bc81b39..000000000000 --- a/devel/gnomevfs2/files/patch-modules_vfolder_vfolder-info.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 c594e7a9483b..2540d81f57e7 100644 --- a/devel/gnomevfs2/pkg-plist +++ b/devel/gnomevfs2/pkg-plist @@ -3,18 +3,12 @@ bin/gnomevfs-copy bin/gnomevfs-info bin/gnomevfs-ls bin/gnomevfs-mkdir +bin/gnomevfs-mv bin/gnomevfs-rm %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf etc/gnome-vfs-2.0/modules/default-modules.conf %%SAMBA%%etc/gnome-vfs-2.0/modules/smb-module.conf etc/gnome-vfs-2.0/modules/ssl-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-address.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-application-registry.h @@ -31,6 +25,7 @@ include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-find-directory.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-handle.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-init.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-job-limit.h +include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-deprecated.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-handlers.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-info-cache.h include/gnome-vfs-2.0/libgnomevfs/gnome-vfs-mime-monitor.h @@ -75,13 +70,12 @@ lib/gnome-vfs-2.0/modules/libnntp.so lib/gnome-vfs-2.0/modules/libsftp.so %%SAMBA%%lib/gnome-vfs-2.0/modules/libsmb.so lib/gnome-vfs-2.0/modules/libtar.so -lib/gnome-vfs-2.0/modules/libvfolder-desktop.so lib/gnome-vfs-2.0/modules/libvfs-pipe.so lib/gnome-vfs-2.0/modules/libvfs-test.so lib/gnome-vfs-2.0/modules/libvfs-translate.so lib/libgnomevfs-2.a lib/libgnomevfs-2.so -lib/libgnomevfs-2.so.800 +lib/libgnomevfs-2.so.1000 libdata/bonobo/servers/GNOME_VFS_Daemon.server libdata/bonobo/servers/GNOME_VFS_Moniker_std.server libdata/pkgconfig/gnome-vfs-2.0.pc @@ -110,6 +104,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html +share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database-deprecated.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html @@ -143,9 +138,9 @@ share/doc/gnome-vfs-2.0/mime-registry.html share/doc/gnome-vfs-2.0/modules.html share/doc/gnome-vfs-2.0/networking.html share/doc/gnome-vfs-2.0/right.png +share/doc/gnome-vfs-2.0/style.css share/doc/gnome-vfs-2.0/up.png share/doc/gnome-vfs-2.0/volumes.html -%%KDEMENUS%%share/gnome/vfolders/KDE.directory share/locale/af/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo @@ -214,18 +209,18 @@ share/locale/tr/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/uk/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/vi/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/wa/LC_MESSAGES/gnome-vfs-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-vfs-2.0.mo share/locale/yi/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 share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/doc/gnome-vfs-2.0 @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 +@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 9bb4bd71232b..1189bceee5ea 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -6,21 +6,25 @@ # PORTNAME= libglade2 -PORTVERSION= 2.4.2 +PORTVERSION= 2.5.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.5 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME glade library -RUN_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr +BUILD_DEPENDS= ${PYEXPAT} +RUN_DEPENDS= ${PYEXPAT} \ + xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_GMAKE= yes +USE_PYTHON= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomehack libxml2 gtk20 INSTALLS_SHLIB= yes @@ -33,19 +37,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= XMLCATALOG="${LOCALBASE}/bin/xmlcatalog" \ CATALOG_PORTS_XML="${LOCALBASE}/share/xml/catalog.ports" -.if !defined(WITHOUT_PYTHON) -BUILD_DEPENDS+= ${PYEXPAT} -RUN_DEPENDS+= ${PYEXPAT} - -USE_PYTHON= yes -PLIST_SUB+= PYTHON="" -.else -USE_REINPLACE= yes -PLIST_SUB+= PYTHON="@comment " - -post-patch: - @${REINPLACE_CMD} -E 's/in (python.*)+ none/in none/' \ - ${WRKSRC}/configure -.endif - .include <bsd.port.mk> diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo index e9de85991c82..5282553c1b70 100644 --- a/devel/libglade2/distinfo +++ b/devel/libglade2/distinfo @@ -1,2 +1,4 @@ -MD5 (gnome2/libglade-2.4.2.tar.bz2) = 83d08f9ab485a10454bd5171d2d53fb0 -SIZE (gnome2/libglade-2.4.2.tar.bz2) = 317692 +MD5 (gnome2/libglade-2.5.1.tar.bz2) = e4734a59f1f2308d7714dc0ebf8163f1 +SIZE (gnome2/libglade-2.5.1.tar.bz2) = 317524 +MD5 (gnome2/tacos) = e4734a59f1f2308d7714dc0ebf8163f2 +SIZE (gnome2/tacos) = 317525 diff --git a/devel/libglade2/files/patch-ab b/devel/libglade2/files/patch-ab index 48724e9e9200..1ef7b7ed18bc 100644 --- a/devel/libglade2/files/patch-ab +++ b/devel/libglade2/files/patch-ab @@ -1,5 +1,5 @@ ---- Makefile.in.orig Mon Nov 29 15:14:24 2004 -+++ Makefile.in Mon Nov 29 15:14:24 2004 +--- Makefile.in.orig Mon May 17 12:30:40 2004 ++++ Makefile.in Mon May 17 12:31:44 2004 @@ -22,7 +22,7 @@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -9,7 +9,7 @@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -@@ -250,7 +250,7 @@ +@@ -229,7 +229,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ diff --git a/devel/libglade2/pkg-plist b/devel/libglade2/pkg-plist index 588f41a86546..cba156fe6624 100644 --- a/devel/libglade2/pkg-plist +++ b/devel/libglade2/pkg-plist @@ -1,4 +1,4 @@ -%%PYTHON%%bin/libglade-convert +bin/libglade-convert include/libglade-2.0/glade/glade-build.h include/libglade-2.0/glade/glade-init.h include/libglade-2.0/glade/glade-parser.h diff --git a/devel/libgsf-gnome/Makefile b/devel/libgsf-gnome/Makefile index 0634e22a7f49..172b752b9c27 100644 --- a/devel/libgsf-gnome/Makefile +++ b/devel/libgsf-gnome/Makefile @@ -7,7 +7,6 @@ CATEGORIES= devel gnome PKGNAMESUFFIX= -gnome -PORTREVISION= 1 MAINTAINER= gnome@FreeBSD.org COMMENT= A GNOME wrapper for libgsf diff --git a/devel/libgsf-gnome/pkg-plist b/devel/libgsf-gnome/pkg-plist index 7951e9d386d1..fdd0f93c589f 100644 --- a/devel/libgsf-gnome/pkg-plist +++ b/devel/libgsf-gnome/pkg-plist @@ -5,6 +5,6 @@ include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h lib/libgsf-gnome-1.a lib/libgsf-gnome-1.so -lib/libgsf-gnome-1.so.11 +lib/libgsf-gnome-1.so.12 libdata/pkgconfig/libgsf-gnome-1.pc @dirrm include/libgsf-1/gsf-gnome diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 9e1572e154d1..e7a43b557eb1 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libgsf -PORTVERSION= 1.10.1 +PORTVERSION= 1.11.1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -24,7 +24,7 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes USE_GNOME?= gnomehack glib20 libxml2 USE_LIBTOOL_VER=15 -CONFIGURE_ARGS?= --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS?=--with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc --without-gnome --with-bz2 CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo index 8d2a941e63ad..01cc1c40a6dd 100644 --- a/devel/libgsf/distinfo +++ b/devel/libgsf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgsf-1.10.1.tar.bz2) = b7b1c1e9adf3fd39a4df6f6891bf3bca -SIZE (gnome2/libgsf-1.10.1.tar.bz2) = 399510 +MD5 (gnome2/libgsf-1.11.1.tar.bz2) = b6d867f46e20dca5c6bf2cf3bfc38cfc +SIZE (gnome2/libgsf-1.11.1.tar.bz2) = 413711 diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist index 0e9f5a3ec9b5..9f6dc384532b 100644 --- a/devel/libgsf/pkg-plist +++ b/devel/libgsf/pkg-plist @@ -1,5 +1,6 @@ include/libgsf-1/gsf-win32/gsf-input-win32.h include/libgsf-1/gsf-win32/gsf-output-win32.h +include/libgsf-1/gsf/gsf-doc-meta-data.h include/libgsf-1/gsf/gsf-impl-utils.h include/libgsf-1/gsf/gsf-infile-impl.h include/libgsf-1/gsf/gsf-infile-msole.h @@ -12,10 +13,12 @@ include/libgsf-1/gsf/gsf-input-gzip.h include/libgsf-1/gsf/gsf-input-impl.h include/libgsf-1/gsf/gsf-input-iochannel.h include/libgsf-1/gsf/gsf-input-memory.h +include/libgsf-1/gsf/gsf-input-proxy.h include/libgsf-1/gsf/gsf-input-stdio.h include/libgsf-1/gsf/gsf-input-textline.h include/libgsf-1/gsf/gsf-input.h include/libgsf-1/gsf/gsf-libxml.h +include/libgsf-1/gsf/gsf-meta-names.h include/libgsf-1/gsf/gsf-msole-utils.h include/libgsf-1/gsf/gsf-outfile-impl.h include/libgsf-1/gsf/gsf-outfile-msole.h @@ -35,7 +38,7 @@ 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.11 +lib/libgsf-1.so.12 libdata/pkgconfig/libgsf-1.pc share/doc/gsf/api.html share/doc/gsf/gsf-Bononbo.html diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 862a5ca17378..5a15a4612020 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgtop2 -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 DISTNAME= libgtop-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index 05e797b96de7..f6a71904beaf 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgtop-2.8.3.tar.bz2) = 4cacb87938bf702b17a721b2ac068252 -SIZE (gnome2/libgtop-2.8.3.tar.bz2) = 1047504 +MD5 (gnome2/libgtop-2.10.0.tar.bz2) = 9a52cd5332a13e57ca606d8a85a67c97 +SIZE (gnome2/libgtop-2.10.0.tar.bz2) = 746223 diff --git a/devel/libgtop2/files/patch-ah b/devel/libgtop2/files/patch-ah deleted file mode 100644 index e0d7484420ec..000000000000 --- a/devel/libgtop2/files/patch-ah +++ /dev/null @@ -1,63 +0,0 @@ ---- sysdeps/freebsd/procmap.c.orig Sat Sep 25 07:49:06 2004 -+++ sysdeps/freebsd/procmap.c Fri Nov 19 11:26:15 2004 -@@ -47,7 +47,13 @@ - #endif - #endif - -+#ifdef __FreeBSD__ -+#define _KVM_VNODE -+#endif - #include <sys/vnode.h> -+#ifdef __FreeBSD__ -+#undef _KVM_VNODE -+#endif - #include <sys/mount.h> - #include <ufs/ufs/quota.h> - #include <ufs/ufs/inode.h> -@@ -104,7 +110,7 @@ - glibtop_map_entry *maps; - #if defined __FreeBSD__ - struct vnode vnode; --#if __FreeBSD_version >= 500039 -+#if __FreeBSD_version < 500039 - struct inode inode; - #endif - #endif -@@ -122,8 +128,10 @@ - - /* Get the process data */ - pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); -- if ((pinfo == NULL) || (count < 1)) -+ if ((pinfo == NULL) || (count < 1)) { - glibtop_error_io_r (server, "kvm_getprocs (%d)", pid); -+ return NULL; -+ } - - /* Now we get the memory maps. */ - -@@ -264,8 +272,10 @@ - #if defined(__FreeBSD__) && (__FreeBSD_version >= 500039) - switch (vnode.v_type) { - case VREG: -+#if __FreeBSD_version < 600006 - maps [i-1].inode = vnode.v_cachedid; - maps [i-1].device = vnode.v_cachedfs; -+#endif - default: - continue; - } -@@ -278,13 +288,9 @@ - &inode, sizeof (inode)) != sizeof (inode)) - glibtop_error_io_r (server, "kvm_read (inode)"); - -- if (kvm_read (server->machine.kd, -- (unsigned long) vnode.v_mount, -- &mount, sizeof (mount)) != sizeof (mount)) -- glibtop_error_io_r (server, "kvm_read (mount)"); --#endif - maps [i-1].inode = inode.i_number; - maps [i-1].device = inode.i_dev; -+#endif - #endif - } while (entry.next != first); - diff --git a/devel/libgtop2/files/patch-lib::lib.pl b/devel/libgtop2/files/patch-lib::lib.pl deleted file mode 100644 index 6e08ba030855..000000000000 --- a/devel/libgtop2/files/patch-lib::lib.pl +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/lib.pl.orig Mon Sep 1 20:17:45 2003 -+++ lib/lib.pl Wed Sep 3 11:53:12 2003 -@@ -116,6 +116,8 @@ - $param_decl = ''; - $send_size = ''; - $send_ptr = ''; -+ $send_buf_decl = ''; -+ $send_buf = ''; - $nr_params = (@params = split(/:/, $param_def, 9999)); - for ($param = 1; $param <= $nr_params; $param++) { - $list = $params[$param]; -@@ -135,28 +137,37 @@ - - $fields[$field]; - $call_param = $call_param . ', ' . $fields[$field]; -- if ($send_ptr eq '') { -- $send_ptr = "\n\tconst void *send_ptr = &" . -- -- $fields[$field] . ';'; -- } -- if ($send_size eq '') { -- $send_size = "\n\tconst size_t send_size =\n\t\t"; -+ if ($send_buf eq '') { -+ $send_size = "\n\tconst size_t send_size = "; -+ $send_ptr = "\n\tconst void *send_ptr = &"; -+ if ($nr_params == 1 && $count == 1) { -+ $send_size = $send_size . 'sizeof (' . $fields[$field] . ');'; -+ $send_ptr = $send_ptr . $fields[$field] . ';'; -+ last; -+ } -+ $send_size = $send_size . 'sizeof (send_buf);'; -+ $send_ptr = $send_ptr . 'send_buf;'; - } - else { -- $send_size = $send_size . ' + '; -+ $send_buf_decl = $send_buf_decl . ' '; -+ $send_buf = $send_buf . ', '; - } -- $send_size = $send_size . 'sizeof (' . $fields[$field] . ')'; -+ $send_buf_decl = $send_buf_decl . '' . $convert{$type} . ' ' . -+ -+ $fields[$field] . ';'; -+ $send_buf = $send_buf . '' . $fields[$field]; - } - } -- if ($send_size ne '') { -- $send_size = $send_size . ';'; -- } -- else { -+ if ($send_size eq '') { - $send_size = "\n\tconst size_t send_size = 0;"; - } - if ($send_ptr eq '') { - $send_ptr = "\n\tconst void *send_ptr = NULL;"; -+ } -+ if ($send_buf ne '') { -+ $send_ptr = "\n\tconst struct { " . $send_buf_decl . " } send_buf =\n" . -+ "\t\t{ " . $send_buf . ' };' . -+ $send_ptr; - } - } - diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c b/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c deleted file mode 100644 index 0713da61925e..000000000000 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::procmem.c +++ /dev/null @@ -1,30 +0,0 @@ ---- sysdeps/freebsd/procmem.c.orig Mon Jul 19 02:07:03 2004 -+++ sysdeps/freebsd/procmem.c Tue Jul 20 22:03:29 2004 -@@ -125,7 +125,7 @@ - #else - struct vm_object object; - #endif -- struct plimit plimit; -+ struct rlimit rlimit; - int count; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); -@@ -160,15 +160,12 @@ - - #define PROC_VMSPACE kp_proc.p_vmspace - -- if (kvm_read (server->machine.kd, -- (unsigned long) pinfo [0].PROC_VMSPACE, -- (char *) &plimit, sizeof (plimit)) != sizeof (plimit)) { -- glibtop_warn_io_r (server, "kvm_read (plimit)"); -+ if (getrlimit (RLIMIT_RSS, &rlimit) < 0) { -+ glibtop_warn_io_r (server, "getrlimit"); - return; - } - -- buf->rss_rlim = (guint64) -- (plimit.pl_rlimit [RLIMIT_RSS].rlim_cur); -+ buf->rss_rlim = (u_int64_t) (rlimit.rlim_cur); - - vms = &pinfo [0].kp_eproc.e_vm; - diff --git a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c b/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c deleted file mode 100644 index 37b5b56df49a..000000000000 --- a/devel/libgtop2/files/patch-sysdeps::freebsd::proctime.c +++ /dev/null @@ -1,48 +0,0 @@ ---- sysdeps/freebsd/proctime.c.orig Wed Mar 10 21:23:52 2004 -+++ sysdeps/freebsd/proctime.c Thu Mar 11 15:47:35 2004 -@@ -59,6 +59,7 @@ - - #ifndef __FreeBSD__ - -+#ifndef __FreeBSD__ - static void - calcru(p, up, sp, ip) - struct proc *p; -@@ -81,19 +82,10 @@ - tot = 1; - } - --#if (defined __FreeBSD__) && (__FreeBSD_version >= 300003) -- -- /* This was changed from a `struct timeval' into a `guint64' -- * on FreeBSD 3.0 and renamed p_rtime -> p_runtime. -- */ -- -- totusec = (u_quad_t) p->p_runtime; --#else - sec = p->p_rtime.tv_sec; - usec = p->p_rtime.tv_usec; - - totusec = (quad_t)sec * 1000000 + usec; --#endif - - if (totusec < 0) { - /* XXX no %qd in kernel. Truncate. */ -@@ -116,6 +108,7 @@ - ip->tv_usec = it % 1000000; - } - } -+#endif - - #endif /* !__FreeBSD__ */ - -@@ -133,9 +126,6 @@ - #endif - struct pstats pstats; - int count; -- -- char filename [BUFSIZ]; -- struct stat statb; - - glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0); - diff --git a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c b/devel/libgtop2/files/patch-sysdeps_common_fsusage.c deleted file mode 100644 index de564dcfd5f6..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_common_fsusage.c +++ /dev/null @@ -1,14 +0,0 @@ ---- sysdeps/common/fsusage.c.orig Sun Oct 17 00:51:26 2004 -+++ sysdeps/common/fsusage.c Sun Oct 17 00:52:07 2004 -@@ -253,8 +253,9 @@ - if (statvfs (path, &fsd) < 0) - return; - --#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) -- /* Solaris but not SunOS */ -+#if (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__)) \ -+ || defined(__FreeBSD__) -+ /* Solaris but not SunOS and FreeBSD */ - buf->block_size = fsd.f_frsize; - #else - /* else, including Linux */ diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in deleted file mode 100644 index 16bcbb055472..000000000000 --- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- sysdeps/freebsd/Makefile.in.orig Sun Feb 15 16:13:22 2004 -+++ sysdeps/freebsd/Makefile.in Sun Feb 15 16:16:05 2004 -@@ -138,7 +138,7 @@ - - noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la - --libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c -+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c - - libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) - -@@ -172,7 +172,7 @@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ - libgtop_sysdeps_2_0_la_LIBADD = --libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo -+libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo - libgtop_sysdeps_suid_2_0_la_LIBADD = - libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo siglist.lo \ - cpu.lo mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo \ diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 8bc83937eb9c..1f1a0363cadd 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -4,7 +4,6 @@ include/libgtop-2.0/glibtop.h include/libgtop-2.0/glibtop/close.h include/libgtop-2.0/glibtop/command.h include/libgtop-2.0/glibtop/cpu.h -include/libgtop-2.0/glibtop/error.h include/libgtop-2.0/glibtop/fsusage.h include/libgtop-2.0/glibtop/global.h include/libgtop-2.0/glibtop/gnuserv.h @@ -13,8 +12,8 @@ include/libgtop-2.0/glibtop/loadavg.h include/libgtop-2.0/glibtop/mem.h include/libgtop-2.0/glibtop/mountlist.h include/libgtop-2.0/glibtop/msg_limits.h +include/libgtop-2.0/glibtop/netlist.h include/libgtop-2.0/glibtop/netload.h -include/libgtop-2.0/glibtop/open.h include/libgtop-2.0/glibtop/parameter.h include/libgtop-2.0/glibtop/ppp.h include/libgtop-2.0/glibtop/procargs.h @@ -22,27 +21,25 @@ include/libgtop-2.0/glibtop/prockernel.h include/libgtop-2.0/glibtop/proclist.h include/libgtop-2.0/glibtop/procmap.h include/libgtop-2.0/glibtop/procmem.h +include/libgtop-2.0/glibtop/procopenfiles.h include/libgtop-2.0/glibtop/procsegment.h include/libgtop-2.0/glibtop/procsignal.h include/libgtop-2.0/glibtop/procstate.h include/libgtop-2.0/glibtop/proctime.h include/libgtop-2.0/glibtop/procuid.h -include/libgtop-2.0/glibtop/read.h -include/libgtop-2.0/glibtop/read_data.h include/libgtop-2.0/glibtop/sem_limits.h include/libgtop-2.0/glibtop/shm_limits.h include/libgtop-2.0/glibtop/signal.h include/libgtop-2.0/glibtop/swap.h include/libgtop-2.0/glibtop/sysdeps.h include/libgtop-2.0/glibtop/sysinfo.h -include/libgtop-2.0/glibtop/types.h include/libgtop-2.0/glibtop/union.h include/libgtop-2.0/glibtop/uptime.h include/libgtop-2.0/glibtop/version.h -include/libgtop-2.0/glibtop/write.h include/libgtop-2.0/glibtop_machine.h include/libgtop-2.0/glibtop_server.h include/libgtop-2.0/glibtop_suid.h +include/libgtop-2.0/libgtopconfig.h lib/libgtop-2.0.a lib/libgtop-2.0.so lib/libgtop-2.0.so.2 @@ -87,6 +84,7 @@ share/locale/ml/LC_MESSAGES/libgtop-2.0.mo share/locale/mn/LC_MESSAGES/libgtop-2.0.mo share/locale/ms/LC_MESSAGES/libgtop-2.0.mo share/locale/nb/LC_MESSAGES/libgtop-2.0.mo +share/locale/ne/LC_MESSAGES/libgtop-2.0.mo share/locale/nl/LC_MESSAGES/libgtop-2.0.mo share/locale/nn/LC_MESSAGES/libgtop-2.0.mo share/locale/no/LC_MESSAGES/libgtop-2.0.mo diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index 5170f104b1fa..ca0ae8b1291e 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gedit -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,16 +23,16 @@ INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier \ +USE_GNOME= gnomeprefix gnomehack intlhack \ libgnomeprintui libgnomeui eel2 gtksourceview desktopfileutils CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.8" +PLIST_SUB= VERSION="2.10" MAN1= gedit.1 GCONF_SCHEMAS= gedit.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo index dafbcd5a161f..7d546ded534c 100644 --- a/editors/gedit/distinfo +++ b/editors/gedit/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gedit-2.8.3.tar.bz2) = 091b399294b8f5f9598da00c05868e23 -SIZE (gnome2/gedit-2.8.3.tar.bz2) = 2539284 +MD5 (gnome2/gedit-2.10.0.tar.bz2) = 933f551489ca8303a07f3cd0c42d5881 +SIZE (gnome2/gedit-2.10.0.tar.bz2) = 3097584 diff --git a/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c new file mode 100644 index 000000000000..5110fb708c4f --- /dev/null +++ b/editors/gedit/files/patch-plugins_spell_gedit-spell-checker.c @@ -0,0 +1,13 @@ +--- plugins/spell/gedit-spell-checker.c.orig Wed Dec 1 20:03:36 2004 ++++ plugins/spell/gedit-spell-checker.c Wed Dec 1 20:03:59 2004 +@@ -319,9 +319,9 @@ + static const GeditLanguage* + get_language_from_abrev (const gchar *abrev) + { ++ const GSList *langs; + g_return_val_if_fail (abrev != NULL, NULL); + +- const GSList *langs; + langs = gedit_spell_checker_get_available_languages (); + + while (langs != NULL) diff --git a/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c b/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c new file mode 100644 index 000000000000..81f704d8c5c9 --- /dev/null +++ b/editors/gedit/files/patch-plugins_taglist_gedit-taglist-plugin-parser.c @@ -0,0 +1,18 @@ +--- plugins/taglist/gedit-taglist-plugin-parser.c.orig Wed Jan 26 19:28:35 2005 ++++ plugins/taglist/gedit-taglist-plugin-parser.c Wed Jan 26 19:28:58 2005 +@@ -276,12 +276,13 @@ + else + { + const char * const *langs_pointer; ++ gchar* lang; + gint i; ++ gint cur_lanking = 1; + + langs_pointer = g_get_language_names (); + +- gchar* lang= (gchar*)xmlGetProp (cur, (const xmlChar*) "lang"); +- gint cur_lanking = 1; ++ lang= (gchar*)xmlGetProp (cur, (const xmlChar*) "lang"); + + /* + * When found a new TagGroup, append the best diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist index fe65e82adfb8..d3732cae1da8 100644 --- a/editors/gedit/pkg-plist +++ b/editors/gedit/pkg-plist @@ -5,6 +5,7 @@ include/gedit-%%VERSION%%/gedit/bonobo-mdi.h include/gedit-%%VERSION%%/gedit/gedit-convert.h include/gedit-%%VERSION%%/gedit/gedit-debug.h include/gedit-%%VERSION%%/gedit/gedit-document.h +include/gedit-%%VERSION%%/gedit/gedit-encodings-option-menu.h include/gedit-%%VERSION%%/gedit/gedit-encodings.h include/gedit-%%VERSION%%/gedit/gedit-file.h include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h @@ -26,7 +27,6 @@ include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h -lib/bonobo/libgedit-control.so lib/gedit-2/plugins/changecase.gedit-plugin lib/gedit-2/plugins/docinfo.gedit-plugin lib/gedit-2/plugins/indent.gedit-plugin @@ -34,12 +34,14 @@ lib/gedit-2/plugins/libchangecase.so lib/gedit-2/plugins/libdocinfo.so lib/gedit-2/plugins/libindent.so lib/gedit-2/plugins/libsample.so +lib/gedit-2/plugins/libsavecopy.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/savecopy.gedit-plugin lib/gedit-2/plugins/shell_output.gedit-plugin lib/gedit-2/plugins/sort.gedit-plugin lib/gedit-2/plugins/spell.gedit-plugin @@ -68,7 +70,6 @@ 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/gnome-2.0/ui/gedit-viewer-ui.xml share/gnome/help/gedit/C/figures/gedit_format_bold.png share/gnome/help/gedit/C/figures/gedit_format_italic.png share/gnome/help/gedit/C/figures/gedit_format_strikethrough.png diff --git a/editors/gnome2-office/Makefile b/editors/gnome2-office/Makefile index e583d0a40486..3c12c9059762 100644 --- a/editors/gnome2-office/Makefile +++ b/editors/gnome2-office/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-office -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= editors gnome MASTER_SITES= # empty DISTFILES= # empty diff --git a/games/gnome-games-extra-data/Makefile b/games/gnome-games-extra-data/Makefile index cfc08d4f3f99..f9b6017459aa 100644 --- a/games/gnome-games-extra-data/Makefile +++ b/games/gnome-games-extra-data/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2-extra-data -PORTVERSION= 2.8.0 +PORTVERSION= 2.10.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8 +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10 DISTNAME= gnome-games-extra-data-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/games/gnome-games-extra-data/distinfo b/games/gnome-games-extra-data/distinfo index 8327f7a2740c..aac4e3c29660 100644 --- a/games/gnome-games-extra-data/distinfo +++ b/games/gnome-games-extra-data/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2 -SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341 +MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0 +SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365 diff --git a/games/gnome-games-extra-data/pkg-plist b/games/gnome-games-extra-data/pkg-plist index 4d53d44d82b3..ac96ec5afe0a 100644 --- a/games/gnome-games-extra-data/pkg-plist +++ b/games/gnome-games-extra-data/pkg-plist @@ -1,3 +1,7 @@ +share/gnome/gnome-games/same-gnome/themes/2.10/blink.png +share/gnome/gnome-games/same-gnome/themes/2.10/glass.png +share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png +share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png share/gnome/pixmaps/glines/gumball.png @@ -24,8 +28,6 @@ share/gnome/pixmaps/mahjongg/default.png share/gnome/pixmaps/mahjongg/default2.png share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/seta.png -share/gnome/pixmaps/same-gnome/blink-sync.png -share/gnome/pixmaps/same-gnome/glass.png -share/gnome/pixmaps/same-gnome/marbles.png -share/gnome/pixmaps/same-gnome/rotate.png -@dirrm share/gnome/pixmaps/same-gnome +@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 +@dirrm share/gnome/gnome-games/same-gnome/themes +@dirrm share/gnome/gnome-games/same-gnome diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index eba339873a13..b36d2def0e2d 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.8 +MASTER_SITE_SUBDIR= sources/gnome-games/2.10 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +19,12 @@ COMMENT= The game applications package for the Gnome 2 Desktop Environment LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile USE_BZIP2= yes -USE_X_PREFIX= yes +USE_PYTHON= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -32,16 +33,24 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \ glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \ gnome-stones.schemas gnometris.schemas gnomine.schemas \ - gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \ - same-gnome.schemas + gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \ + libgnomegames.schemas mahjongg.schemas same-gnome.schemas CONFLICTS= sol-1.0.* +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' + @${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \ + ${WRKSRC}/libgames-support/games-server.py post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index 2104d853d2e5..504bc5c7fce3 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.8.3.tar.bz2) = 0ee8f7cb3a95a5e69a7c9cbb4dc6c66a -SIZE (gnome2/gnome-games-2.8.3.tar.bz2) = 5923240 +MD5 (gnome2/gnome-games-2.10.0.tar.bz2) = c3a1a8fd025a0174efa70d4e480114cf +SIZE (gnome2/gnome-games-2.10.0.tar.bz2) = 5292770 diff --git a/games/gnome-games/files/patch-iagno_othello.c b/games/gnome-games/files/patch-iagno_othello.c index 84b963a911e2..1d6d8e88a6a7 100644 --- a/games/gnome-games/files/patch-iagno_othello.c +++ b/games/gnome-games/files/patch-iagno_othello.c @@ -1,29 +1,20 @@ ---- iagno/othello.c.orig Mon Feb 14 12:07:12 2005 -+++ iagno/othello.c Mon Feb 14 12:07:47 2005 -@@ -551,7 +551,7 @@ - memcpy (tboard, board, sizeof (gint8) * 8 * 8); - move_board(tboard, i, j, me, 0); - -- // assume that opponent takes best move -+ /* assume that opponent takes best move */ - tmp_move = find_best_move(tboard, not_me, ply_depth-1, - -pass_thresh, -use_thresh, 0, 0); - -@@ -808,14 +808,14 @@ +--- iagno/othello.c.orig Tue Jan 25 11:24:35 2005 ++++ iagno/othello.c Tue Jan 25 11:24:56 2005 +@@ -784,14 +784,14 @@ found_free = TRUE; } - // check if a player is dead + /* check if a player is dead */ if (!found_me && found_not_me) - return (-10000); + return (S_LOSING_GAME); else if (found_me && !found_not_me) - return (10000); + return (S_WINNING_GAME); - // if the game is finished, return the actual score rather than - // a huristic + /* if the game is finished, return the actual score rather than -+ a huristic */ ++ * a huristic */ if (!found_free) return (actual_score); diff --git a/games/gnome-games/pkg-install b/games/gnome-games/pkg-install index da897732169d..7b1b35161239 100644 --- a/games/gnome-games/pkg-install +++ b/games/gnome-games/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 6df66145aa97..18e3c7765d79 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -1,4 +1,5 @@ bin/blackjack +bin/games-server.py bin/gataxx bin/glines bin/gnect @@ -14,7 +15,6 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist @@ -78,6 +78,7 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores @unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores @unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores +@unexec [ -s %D/share/gnome/games/gnotski.10.scores ] || rm -f %D/share/gnome/games/gnotski.10.scores @unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores @unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores @unexec [ -s %D/share/gnome/games/gnotski.13.scores ] || rm -f %D/share/gnome/games/gnotski.13.scores @@ -85,18 +86,34 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/gnotski.15.scores ] || rm -f %D/share/gnome/games/gnotski.15.scores @unexec [ -s %D/share/gnome/games/gnotski.16.scores ] || rm -f %D/share/gnome/games/gnotski.16.scores @unexec [ -s %D/share/gnome/games/gnotski.17.scores ] || rm -f %D/share/gnome/games/gnotski.17.scores +@unexec [ -s %D/share/gnome/games/gnotski.18.scores ] || rm -f %D/share/gnome/games/gnotski.18.scores +@unexec [ -s %D/share/gnome/games/gnotski.19.scores ] || rm -f %D/share/gnome/games/gnotski.19.scores @unexec [ -s %D/share/gnome/games/gnotski.2.scores ] || rm -f %D/share/gnome/games/gnotski.2.scores +@unexec [ -s %D/share/gnome/games/gnotski.20.scores ] || rm -f %D/share/gnome/games/gnotski.20.scores @unexec [ -s %D/share/gnome/games/gnotski.21.scores ] || rm -f %D/share/gnome/games/gnotski.21.scores @unexec [ -s %D/share/gnome/games/gnotski.22.scores ] || rm -f %D/share/gnome/games/gnotski.22.scores @unexec [ -s %D/share/gnome/games/gnotski.23.scores ] || rm -f %D/share/gnome/games/gnotski.23.scores @unexec [ -s %D/share/gnome/games/gnotski.24.scores ] || rm -f %D/share/gnome/games/gnotski.24.scores @unexec [ -s %D/share/gnome/games/gnotski.25.scores ] || rm -f %D/share/gnome/games/gnotski.25.scores @unexec [ -s %D/share/gnome/games/gnotski.26.scores ] || rm -f %D/share/gnome/games/gnotski.26.scores +@unexec [ -s %D/share/gnome/games/gnotski.27.scores ] || rm -f %D/share/gnome/games/gnotski.27.scores +@unexec [ -s %D/share/gnome/games/gnotski.28.scores ] || rm -f %D/share/gnome/games/gnotski.28.scores +@unexec [ -s %D/share/gnome/games/gnotski.29.scores ] || rm -f %D/share/gnome/games/gnotski.29.scores @unexec [ -s %D/share/gnome/games/gnotski.3.scores ] || rm -f %D/share/gnome/games/gnotski.3.scores +@unexec [ -s %D/share/gnome/games/gnotski.30.scores ] || rm -f %D/share/gnome/games/gnotski.30.scores +@unexec [ -s %D/share/gnome/games/gnotski.31.scores ] || rm -f %D/share/gnome/games/gnotski.31.scores +@unexec [ -s %D/share/gnome/games/gnotski.32.scores ] || rm -f %D/share/gnome/games/gnotski.32.scores +@unexec [ -s %D/share/gnome/games/gnotski.33.scores ] || rm -f %D/share/gnome/games/gnotski.33.scores +@unexec [ -s %D/share/gnome/games/gnotski.34.scores ] || rm -f %D/share/gnome/games/gnotski.34.scores +@unexec [ -s %D/share/gnome/games/gnotski.35.scores ] || rm -f %D/share/gnome/games/gnotski.35.scores +@unexec [ -s %D/share/gnome/games/gnotski.36.scores ] || rm -f %D/share/gnome/games/gnotski.36.scores +@unexec [ -s %D/share/gnome/games/gnotski.37.scores ] || rm -f %D/share/gnome/games/gnotski.37.scores @unexec [ -s %D/share/gnome/games/gnotski.4.scores ] || rm -f %D/share/gnome/games/gnotski.4.scores @unexec [ -s %D/share/gnome/games/gnotski.5.scores ] || rm -f %D/share/gnome/games/gnotski.5.scores @unexec [ -s %D/share/gnome/games/gnotski.6.scores ] || rm -f %D/share/gnome/games/gnotski.6.scores @unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores +@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores +@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores @unexec [ -s %D/share/gnome/games/gtali.scores ] || rm -f %D/share/gnome/games/gtali.scores @unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores @unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores @@ -107,7 +124,9 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores @unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores -@unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl share/gnome/gnibbles/level002.gnl @@ -140,6 +159,9 @@ share/gnome/gnobots2/nightmare.cfg share/gnome/gnobots2/robots2.cfg share/gnome/gnobots2/robots2_easy.cfg share/gnome/gnobots2/robots_with_safe_teleport.cfg +share/gnome/gnome-games/mahjongg/maps/mahjongg.map +share/gnome/gnome-games/same-gnome/themes/2.10/planets.png +share/gnome/gnome-games/same-gnome/themes/2.10/stones.png share/gnome/gnome-stones/atari.caves share/gnome/gnome-stones/default.caves share/gnome/gnome-stones/gnome-stonesrc @@ -223,6 +245,83 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml share/gnome/help/aisleriot/C/yield.xml share/gnome/help/aisleriot/C/yukon.xml share/gnome/help/aisleriot/C/zebra.xml +share/gnome/help/aisleriot/fr/agnes.xml +share/gnome/help/aisleriot/fr/aisleriot.xml +share/gnome/help/aisleriot/fr/auld_lang_syne.xml +share/gnome/help/aisleriot/fr/bakers_dozen.xml +share/gnome/help/aisleriot/fr/bakers_game.xml +share/gnome/help/aisleriot/fr/beleaguered_castle.xml +share/gnome/help/aisleriot/fr/block_ten.xml +share/gnome/help/aisleriot/fr/bristol.xml +share/gnome/help/aisleriot/fr/camelot.xml +share/gnome/help/aisleriot/fr/canfield.xml +share/gnome/help/aisleriot/fr/chessboard.xml +share/gnome/help/aisleriot/fr/clock.xml +share/gnome/help/aisleriot/fr/cover.xml +share/gnome/help/aisleriot/fr/definitions.xml +share/gnome/help/aisleriot/fr/diamond_mine.xml +share/gnome/help/aisleriot/fr/doublets.xml +share/gnome/help/aisleriot/fr/eagle-wing.xml +share/gnome/help/aisleriot/fr/easthaven.xml +share/gnome/help/aisleriot/fr/eight_off.xml +share/gnome/help/aisleriot/fr/elevator.xml +share/gnome/help/aisleriot/fr/escalator.xml +share/gnome/help/aisleriot/fr/figures/camelot-goal.png +share/gnome/help/aisleriot/fr/figures/clock-rules.png +share/gnome/help/aisleriot/fr/first_law.xml +share/gnome/help/aisleriot/fr/fortress.xml +share/gnome/help/aisleriot/fr/fortunes.xml +share/gnome/help/aisleriot/fr/fourteen.xml +share/gnome/help/aisleriot/fr/freecell.xml +share/gnome/help/aisleriot/fr/gay_gordons.xml +share/gnome/help/aisleriot/fr/glenwood.xml +share/gnome/help/aisleriot/fr/golf.xml +share/gnome/help/aisleriot/fr/gypsy.xml +share/gnome/help/aisleriot/fr/helsinki.xml +share/gnome/help/aisleriot/fr/hopscotch.xml +share/gnome/help/aisleriot/fr/isabel.xml +share/gnome/help/aisleriot/fr/jamestown.xml +share/gnome/help/aisleriot/fr/jumbo.xml +share/gnome/help/aisleriot/fr/kansas.xml +share/gnome/help/aisleriot/fr/king_albert.xml +share/gnome/help/aisleriot/fr/klondike.xml +share/gnome/help/aisleriot/fr/labyrinth.xml +share/gnome/help/aisleriot/fr/lady_jane.xml +share/gnome/help/aisleriot/fr/legal.xml +share/gnome/help/aisleriot/fr/maze.xml +share/gnome/help/aisleriot/fr/monte_carlo.xml +share/gnome/help/aisleriot/fr/neighbor.xml +share/gnome/help/aisleriot/fr/odessa.xml +share/gnome/help/aisleriot/fr/osmosis.xml +share/gnome/help/aisleriot/fr/peek.xml +share/gnome/help/aisleriot/fr/pileon.xml +share/gnome/help/aisleriot/fr/plait.xml +share/gnome/help/aisleriot/fr/poker.xml +share/gnome/help/aisleriot/fr/quatorze.xml +share/gnome/help/aisleriot/fr/royal_east.xml +share/gnome/help/aisleriot/fr/scorpion.xml +share/gnome/help/aisleriot/fr/scuffle.xml +share/gnome/help/aisleriot/fr/seahaven.xml +share/gnome/help/aisleriot/fr/sir_tommy.xml +share/gnome/help/aisleriot/fr/spider.xml +share/gnome/help/aisleriot/fr/spider_one_suit.xml +share/gnome/help/aisleriot/fr/spider_two_suit.xml +share/gnome/help/aisleriot/fr/spiderette.xml +share/gnome/help/aisleriot/fr/straight_up.xml +share/gnome/help/aisleriot/fr/streets_and_alleys.xml +share/gnome/help/aisleriot/fr/ten_across.xml +share/gnome/help/aisleriot/fr/thieves.xml +share/gnome/help/aisleriot/fr/thirteen.xml +share/gnome/help/aisleriot/fr/thumb_and_pouch.xml +share/gnome/help/aisleriot/fr/treize.xml +share/gnome/help/aisleriot/fr/union_square.xml +share/gnome/help/aisleriot/fr/valentine.xml +share/gnome/help/aisleriot/fr/westhaven.xml +share/gnome/help/aisleriot/fr/whitehead.xml +share/gnome/help/aisleriot/fr/will_o_the_wisp.xml +share/gnome/help/aisleriot/fr/yield.xml +share/gnome/help/aisleriot/fr/yukon.xml +share/gnome/help/aisleriot/fr/zebra.xml share/gnome/help/blackjack/C/blackjack.xml share/gnome/help/blackjack/C/figures/blackjack_start_window.png share/gnome/help/blackjack/C/figures/blackjack_win_window.png @@ -302,19 +401,17 @@ share/gnome/help/mahjongg/C/figures/mahjongg.png share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png -share/gnome/help/mahjongg/C/figures/seed.png share/gnome/help/mahjongg/C/figures/toolbar.png share/gnome/help/mahjongg/C/legal.xml share/gnome/help/mahjongg/C/mahjongg.xml -share/gnome/help/same-gnome/C/figures/blink-sync.png -share/gnome/help/same-gnome/C/figures/preferences.png -share/gnome/help/same-gnome/C/figures/same-main-window.png -share/gnome/help/same-gnome/C/figures/same-planets-fig.png +share/gnome/help/same-gnome/C/figures/play.png +share/gnome/help/same-gnome/C/figures/start-up.png share/gnome/help/same-gnome/C/legal.xml share/gnome/help/same-gnome/C/same-gnome.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf +share/gnome/omf/gnome-games/aisleriot-fr.omf share/gnome/omf/gnome-games/blackjack-C.omf share/gnome/omf/gnome-games/gataxx-C.omf share/gnome/omf/gnome-games/glines-C.omf @@ -341,7 +438,7 @@ share/gnome/pixmaps/blackjack/chip-100.svg share/gnome/pixmaps/blackjack/chip-25.svg share/gnome/pixmaps/blackjack/chip-5.svg share/gnome/pixmaps/cards/baize.png -share/gnome/pixmaps/cards/slot.png +share/gnome/pixmaps/cards/slot.svg share/gnome/pixmaps/cards/slots/white-outline.svg share/gnome/pixmaps/gataxx.png share/gnome/pixmaps/glines.png @@ -391,11 +488,11 @@ share/gnome/pixmaps/gnobots2/gnomes.png share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/yahoo.png -share/gnome/pixmaps/gnome-games-common/cards/bonded.png -share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-blackjack.png share/gnome/pixmaps/gnome-cardgame.png +share/gnome/pixmaps/gnome-games-common/cards/bonded.png +share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-gnobots2.png share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnotravex.png @@ -434,7 +531,7 @@ share/gnome/pixmaps/gnomine/flag-question.svg share/gnome/pixmaps/gnomine/flag.svg share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png -share/gnome/pixmaps/gnotski.png +share/gnome/pixmaps/gnotski.svg share/gnome/pixmaps/gtali/gnome-dice-1.svg share/gnome/pixmaps/gtali/gnome-dice-2.svg share/gnome/pixmaps/gtali/gnome-dice-3.svg @@ -448,8 +545,6 @@ share/gnome/pixmaps/iagno/woodtrim.png share/gnome/pixmaps/mahjongg/postmodern.svg share/gnome/pixmaps/mahjongg/smooth.png share/gnome/pixmaps/rteleport.png -share/gnome/pixmaps/same-gnome/planets.png -share/gnome/pixmaps/same-gnome/stones.png share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm @@ -616,7 +711,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnibbles @dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games -@dirrm share/gnome/pixmaps/same-gnome @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno @dirrm share/gnome/pixmaps/gtali @@ -681,10 +775,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/blackjack/C/figures @dirrm share/gnome/help/blackjack/C @dirrm share/gnome/help/blackjack +@dirrm share/gnome/help/aisleriot/fr/figures +@dirrm share/gnome/help/aisleriot/fr @dirrm share/gnome/help/aisleriot/C/figures @dirrm share/gnome/help/aisleriot/C @dirrm share/gnome/help/aisleriot @dirrm share/gnome/gnome-stones +@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 +@dirrm share/gnome/gnome-games/same-gnome/themes +@dirrm share/gnome/gnome-games/same-gnome +@dirrm share/gnome/gnome-games/mahjongg/maps +@dirrm share/gnome/gnome-games/mahjongg +@dirrm share/gnome/gnome-games @dirrm share/gnome/gnobots2 @dirrm share/gnome/gnibbles @dirrm share/gnome/gnect diff --git a/games/gnomegames2-extra-data/Makefile b/games/gnomegames2-extra-data/Makefile index cfc08d4f3f99..f9b6017459aa 100644 --- a/games/gnomegames2-extra-data/Makefile +++ b/games/gnomegames2-extra-data/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2-extra-data -PORTVERSION= 2.8.0 +PORTVERSION= 2.10.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.8 +MASTER_SITE_SUBDIR= sources/gnome-games-extra-data/2.10 DISTNAME= gnome-games-extra-data-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/games/gnomegames2-extra-data/distinfo b/games/gnomegames2-extra-data/distinfo index 8327f7a2740c..aac4e3c29660 100644 --- a/games/gnomegames2-extra-data/distinfo +++ b/games/gnomegames2-extra-data/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 6a3252a66e3c3ac09e2f951ee2d726b2 -SIZE (gnome2/gnome-games-extra-data-2.8.0.tar.bz2) = 3582341 +MD5 (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 344c36ae58fa13fd4b180bd9fefe94d0 +SIZE (gnome2/gnome-games-extra-data-2.10.0.tar.bz2) = 3566365 diff --git a/games/gnomegames2-extra-data/pkg-plist b/games/gnomegames2-extra-data/pkg-plist index 4d53d44d82b3..ac96ec5afe0a 100644 --- a/games/gnomegames2-extra-data/pkg-plist +++ b/games/gnomegames2-extra-data/pkg-plist @@ -1,3 +1,7 @@ +share/gnome/gnome-games/same-gnome/themes/2.10/blink.png +share/gnome/gnome-games/same-gnome/themes/2.10/glass.png +share/gnome/gnome-games/same-gnome/themes/2.10/marbles.png +share/gnome/gnome-games/same-gnome/themes/2.10/rotate.svg share/gnome/pixmaps/glines/classic.png share/gnome/pixmaps/glines/dots.png share/gnome/pixmaps/glines/gumball.png @@ -24,8 +28,6 @@ share/gnome/pixmaps/mahjongg/default.png share/gnome/pixmaps/mahjongg/default2.png share/gnome/pixmaps/mahjongg/maya.png share/gnome/pixmaps/mahjongg/seta.png -share/gnome/pixmaps/same-gnome/blink-sync.png -share/gnome/pixmaps/same-gnome/glass.png -share/gnome/pixmaps/same-gnome/marbles.png -share/gnome/pixmaps/same-gnome/rotate.png -@dirrm share/gnome/pixmaps/same-gnome +@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 +@dirrm share/gnome/gnome-games/same-gnome/themes +@dirrm share/gnome/gnome-games/same-gnome diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index eba339873a13..b36d2def0e2d 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomegames2 -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-games/2.8 +MASTER_SITE_SUBDIR= sources/gnome-games/2.10 DISTNAME= gnome-games-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -19,11 +19,12 @@ COMMENT= The game applications package for the Gnome 2 Desktop Environment LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile USE_BZIP2= yes -USE_X_PREFIX= yes +USE_PYTHON= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui \ librsvg2 desktopfileutils USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -32,16 +33,24 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= aisleriot.schemas blackjack.schemas gataxx.schemas \ glines.schemas gnect.schemas gnibbles.schemas gnobots2.schemas \ gnome-stones.schemas gnometris.schemas gnomine.schemas \ - gnotravex.schemas gtali.schemas iagno.schemas mahjongg.schemas \ - same-gnome.schemas + gnotravex.schemas gnotski.schemas gtali.schemas iagno.schemas \ + libgnomegames.schemas mahjongg.schemas same-gnome.schemas CONFLICTS= sol-1.0.* +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/lib/libhowl.so) || defined(WITH_MDNS) +LIB_DEPENDS+= howl:${PORTSDIR}/net/howl +.endif + post-patch: @${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' + @${REINPLACE_CMD} -e 's|bin/python|bin/env python|g' \ + ${WRKSRC}/libgames-support/games-server.py post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index 2104d853d2e5..504bc5c7fce3 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-games-2.8.3.tar.bz2) = 0ee8f7cb3a95a5e69a7c9cbb4dc6c66a -SIZE (gnome2/gnome-games-2.8.3.tar.bz2) = 5923240 +MD5 (gnome2/gnome-games-2.10.0.tar.bz2) = c3a1a8fd025a0174efa70d4e480114cf +SIZE (gnome2/gnome-games-2.10.0.tar.bz2) = 5292770 diff --git a/games/gnomegames2/files/patch-iagno_othello.c b/games/gnomegames2/files/patch-iagno_othello.c index 84b963a911e2..1d6d8e88a6a7 100644 --- a/games/gnomegames2/files/patch-iagno_othello.c +++ b/games/gnomegames2/files/patch-iagno_othello.c @@ -1,29 +1,20 @@ ---- iagno/othello.c.orig Mon Feb 14 12:07:12 2005 -+++ iagno/othello.c Mon Feb 14 12:07:47 2005 -@@ -551,7 +551,7 @@ - memcpy (tboard, board, sizeof (gint8) * 8 * 8); - move_board(tboard, i, j, me, 0); - -- // assume that opponent takes best move -+ /* assume that opponent takes best move */ - tmp_move = find_best_move(tboard, not_me, ply_depth-1, - -pass_thresh, -use_thresh, 0, 0); - -@@ -808,14 +808,14 @@ +--- iagno/othello.c.orig Tue Jan 25 11:24:35 2005 ++++ iagno/othello.c Tue Jan 25 11:24:56 2005 +@@ -784,14 +784,14 @@ found_free = TRUE; } - // check if a player is dead + /* check if a player is dead */ if (!found_me && found_not_me) - return (-10000); + return (S_LOSING_GAME); else if (found_me && !found_not_me) - return (10000); + return (S_WINNING_GAME); - // if the game is finished, return the actual score rather than - // a huristic + /* if the game is finished, return the actual score rather than -+ a huristic */ ++ * a huristic */ if (!found_free) return (actual_score); diff --git a/games/gnomegames2/pkg-install b/games/gnomegames2/pkg-install index da897732169d..7b1b35161239 100644 --- a/games/gnomegames2/pkg-install +++ b/games/gnomegames2/pkg-install @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin:/usr/sbin case $2 in POST-INSTALL) mkdir -p ${PKG_PREFIX}/share/gnome/games - SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.2.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.3.scores gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" + SCORES="glines.scores gnibbles.1.0.scores gnibbles.1.1.scores gnibbles.2.0.scores gnibbles.2.1.scores gnibbles.3.0.scores gnibbles.3.1.scores gnibbles.4.0.scores gnibbles.4.1.scores gnobots2.classic_robots-safe.scores gnobots2.classic_robots-super-safe.scores gnobots2.classic_robots.scores gnobots2.nightmare-safe.scores gnobots2.nightmare-super-safe.scores gnobots2.nightmare.scores gnobots2.robots2-safe.scores gnobots2.robots2-super-safe.scores gnobots2.robots2.scores gnobots2.robots2_easy-safe.scores gnobots2.robots2_easy-super-safe.scores gnobots2.robots2_easy.scores gnobots2.robots_with_safe_teleport-safe.scores gnobots2.robots_with_safe_teleport-super-safe.scores gnobots2.robots_with_safe_teleport.scores gnome-stones.scores gnometris.scores gnomine.Custom.scores gnomine.Large.scores gnomine.Medium.scores gnomine.Small.scores gnotravex.2x2.scores gnotravex.3x3.scores gnotravex.4x4.scores gnotravex.5x5.scores gnotravex.6x6.scores gnotski.1.scores gnotski10.scores gnotski.11.scores gnotski.12.scores gnotski.13.scores gnotski.14.scores gnotski.15.scores gnotski.16.scores gnotski.17.scores gnotski.18.scores gnotski.2.scores gnotski.20.scores gnotski.21.scores gnotski.22.scores gnotski.23.scores gnotski.24.scores gnotski.25.scores gnotski.26.scores gnotski.27.scores gnotski.28.scores gnotski.29.scores gnotski.3.scores gnotski.30.scores gnotski.31.scores gnotski.32.scores gnotski.33.scores gnotski.34.scores gnotski.35.scores gnotski.36.scores gnotski.37.score gnotski.4.scores gnotski.5.scores gnotski.6.scores gnotski.7.scores gnotski.8.scores gnotski.9.scores gtali.scores mahjongg.bridges.scores mahjongg.cloud.scores mahjongg.confounding.scores mahjongg.difficult.scores mahjongg.dragon.scores mahjongg.easy.scores mahjongg.pyramid.scores mahjongg.tictactoe.scores mahjongg.ziggurat.scores same-gnome.scores" for i in ${SCORES}; do if [ ! -f ${PKG_PREFIX}/share/gnome/games/${i} ]; then touch -f ${PKG_PREFIX}/share/gnome/games/${i} diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 6df66145aa97..18e3c7765d79 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -1,4 +1,5 @@ bin/blackjack +bin/games-server.py bin/gataxx bin/glines bin/gnect @@ -14,7 +15,6 @@ bin/iagno bin/mahjongg bin/same-gnome bin/sol -etc/sound/events/gnect.soundlist etc/sound/events/gnibbles.soundlist etc/sound/events/gnobots2.soundlist etc/sound/events/iagno.soundlist @@ -78,6 +78,7 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores @unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores @unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores +@unexec [ -s %D/share/gnome/games/gnotski.10.scores ] || rm -f %D/share/gnome/games/gnotski.10.scores @unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores @unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores @unexec [ -s %D/share/gnome/games/gnotski.13.scores ] || rm -f %D/share/gnome/games/gnotski.13.scores @@ -85,18 +86,34 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/gnotski.15.scores ] || rm -f %D/share/gnome/games/gnotski.15.scores @unexec [ -s %D/share/gnome/games/gnotski.16.scores ] || rm -f %D/share/gnome/games/gnotski.16.scores @unexec [ -s %D/share/gnome/games/gnotski.17.scores ] || rm -f %D/share/gnome/games/gnotski.17.scores +@unexec [ -s %D/share/gnome/games/gnotski.18.scores ] || rm -f %D/share/gnome/games/gnotski.18.scores +@unexec [ -s %D/share/gnome/games/gnotski.19.scores ] || rm -f %D/share/gnome/games/gnotski.19.scores @unexec [ -s %D/share/gnome/games/gnotski.2.scores ] || rm -f %D/share/gnome/games/gnotski.2.scores +@unexec [ -s %D/share/gnome/games/gnotski.20.scores ] || rm -f %D/share/gnome/games/gnotski.20.scores @unexec [ -s %D/share/gnome/games/gnotski.21.scores ] || rm -f %D/share/gnome/games/gnotski.21.scores @unexec [ -s %D/share/gnome/games/gnotski.22.scores ] || rm -f %D/share/gnome/games/gnotski.22.scores @unexec [ -s %D/share/gnome/games/gnotski.23.scores ] || rm -f %D/share/gnome/games/gnotski.23.scores @unexec [ -s %D/share/gnome/games/gnotski.24.scores ] || rm -f %D/share/gnome/games/gnotski.24.scores @unexec [ -s %D/share/gnome/games/gnotski.25.scores ] || rm -f %D/share/gnome/games/gnotski.25.scores @unexec [ -s %D/share/gnome/games/gnotski.26.scores ] || rm -f %D/share/gnome/games/gnotski.26.scores +@unexec [ -s %D/share/gnome/games/gnotski.27.scores ] || rm -f %D/share/gnome/games/gnotski.27.scores +@unexec [ -s %D/share/gnome/games/gnotski.28.scores ] || rm -f %D/share/gnome/games/gnotski.28.scores +@unexec [ -s %D/share/gnome/games/gnotski.29.scores ] || rm -f %D/share/gnome/games/gnotski.29.scores @unexec [ -s %D/share/gnome/games/gnotski.3.scores ] || rm -f %D/share/gnome/games/gnotski.3.scores +@unexec [ -s %D/share/gnome/games/gnotski.30.scores ] || rm -f %D/share/gnome/games/gnotski.30.scores +@unexec [ -s %D/share/gnome/games/gnotski.31.scores ] || rm -f %D/share/gnome/games/gnotski.31.scores +@unexec [ -s %D/share/gnome/games/gnotski.32.scores ] || rm -f %D/share/gnome/games/gnotski.32.scores +@unexec [ -s %D/share/gnome/games/gnotski.33.scores ] || rm -f %D/share/gnome/games/gnotski.33.scores +@unexec [ -s %D/share/gnome/games/gnotski.34.scores ] || rm -f %D/share/gnome/games/gnotski.34.scores +@unexec [ -s %D/share/gnome/games/gnotski.35.scores ] || rm -f %D/share/gnome/games/gnotski.35.scores +@unexec [ -s %D/share/gnome/games/gnotski.36.scores ] || rm -f %D/share/gnome/games/gnotski.36.scores +@unexec [ -s %D/share/gnome/games/gnotski.37.scores ] || rm -f %D/share/gnome/games/gnotski.37.scores @unexec [ -s %D/share/gnome/games/gnotski.4.scores ] || rm -f %D/share/gnome/games/gnotski.4.scores @unexec [ -s %D/share/gnome/games/gnotski.5.scores ] || rm -f %D/share/gnome/games/gnotski.5.scores @unexec [ -s %D/share/gnome/games/gnotski.6.scores ] || rm -f %D/share/gnome/games/gnotski.6.scores @unexec [ -s %D/share/gnome/games/gnotski.7.scores ] || rm -f %D/share/gnome/games/gnotski.7.scores +@unexec [ -s %D/share/gnome/games/gnotski.8.scores ] || rm -f %D/share/gnome/games/gnotski.8.scores +@unexec [ -s %D/share/gnome/games/gnotski.9.scores ] || rm -f %D/share/gnome/games/gnotski.9.scores @unexec [ -s %D/share/gnome/games/gtali.scores ] || rm -f %D/share/gnome/games/gtali.scores @unexec [ -s %D/share/gnome/games/mahjongg.bridges.scores ] || rm -f %D/share/gnome/games/mahjongg.bridges.scores @unexec [ -s %D/share/gnome/games/mahjongg.cloud.scores ] || rm -f %D/share/gnome/games/mahjongg.cloud.scores @@ -107,7 +124,9 @@ share/gnome/blackjack/Vegas_Strip.rules @unexec [ -s %D/share/gnome/games/mahjongg.pyramid.scores ] || rm -f %D/share/gnome/games/mahjongg.pyramid.scores @unexec [ -s %D/share/gnome/games/mahjongg.tictactoe.scores ] || rm -f %D/share/gnome/games/mahjongg.tictactoe.scores @unexec [ -s %D/share/gnome/games/mahjongg.ziggurat.scores ] || rm -f %D/share/gnome/games/mahjongg.ziggurat.scores -@unexec [ -s %D/share/gnome/games/same-gnome.scores ] || rm -f %D/share/gnome/games/same-gnome.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Large.scores ] || rm -f %D/share/gnome/games/same-gnome.Large.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Medium.scores ] || rm -f %D/share/gnome/games/same-gnome.Medium.scores +@unexec [ -s %D/share/gnome/games/same-gnome.Small.scores ] || rm -f %D/share/gnome/games/same-gnome.Small.scores share/gnome/gnect/white_ob.cn4 share/gnome/gnibbles/level001.gnl share/gnome/gnibbles/level002.gnl @@ -140,6 +159,9 @@ share/gnome/gnobots2/nightmare.cfg share/gnome/gnobots2/robots2.cfg share/gnome/gnobots2/robots2_easy.cfg share/gnome/gnobots2/robots_with_safe_teleport.cfg +share/gnome/gnome-games/mahjongg/maps/mahjongg.map +share/gnome/gnome-games/same-gnome/themes/2.10/planets.png +share/gnome/gnome-games/same-gnome/themes/2.10/stones.png share/gnome/gnome-stones/atari.caves share/gnome/gnome-stones/default.caves share/gnome/gnome-stones/gnome-stonesrc @@ -223,6 +245,83 @@ share/gnome/help/aisleriot/C/will_o_the_wisp.xml share/gnome/help/aisleriot/C/yield.xml share/gnome/help/aisleriot/C/yukon.xml share/gnome/help/aisleriot/C/zebra.xml +share/gnome/help/aisleriot/fr/agnes.xml +share/gnome/help/aisleriot/fr/aisleriot.xml +share/gnome/help/aisleriot/fr/auld_lang_syne.xml +share/gnome/help/aisleriot/fr/bakers_dozen.xml +share/gnome/help/aisleriot/fr/bakers_game.xml +share/gnome/help/aisleriot/fr/beleaguered_castle.xml +share/gnome/help/aisleriot/fr/block_ten.xml +share/gnome/help/aisleriot/fr/bristol.xml +share/gnome/help/aisleriot/fr/camelot.xml +share/gnome/help/aisleriot/fr/canfield.xml +share/gnome/help/aisleriot/fr/chessboard.xml +share/gnome/help/aisleriot/fr/clock.xml +share/gnome/help/aisleriot/fr/cover.xml +share/gnome/help/aisleriot/fr/definitions.xml +share/gnome/help/aisleriot/fr/diamond_mine.xml +share/gnome/help/aisleriot/fr/doublets.xml +share/gnome/help/aisleriot/fr/eagle-wing.xml +share/gnome/help/aisleriot/fr/easthaven.xml +share/gnome/help/aisleriot/fr/eight_off.xml +share/gnome/help/aisleriot/fr/elevator.xml +share/gnome/help/aisleriot/fr/escalator.xml +share/gnome/help/aisleriot/fr/figures/camelot-goal.png +share/gnome/help/aisleriot/fr/figures/clock-rules.png +share/gnome/help/aisleriot/fr/first_law.xml +share/gnome/help/aisleriot/fr/fortress.xml +share/gnome/help/aisleriot/fr/fortunes.xml +share/gnome/help/aisleriot/fr/fourteen.xml +share/gnome/help/aisleriot/fr/freecell.xml +share/gnome/help/aisleriot/fr/gay_gordons.xml +share/gnome/help/aisleriot/fr/glenwood.xml +share/gnome/help/aisleriot/fr/golf.xml +share/gnome/help/aisleriot/fr/gypsy.xml +share/gnome/help/aisleriot/fr/helsinki.xml +share/gnome/help/aisleriot/fr/hopscotch.xml +share/gnome/help/aisleriot/fr/isabel.xml +share/gnome/help/aisleriot/fr/jamestown.xml +share/gnome/help/aisleriot/fr/jumbo.xml +share/gnome/help/aisleriot/fr/kansas.xml +share/gnome/help/aisleriot/fr/king_albert.xml +share/gnome/help/aisleriot/fr/klondike.xml +share/gnome/help/aisleriot/fr/labyrinth.xml +share/gnome/help/aisleriot/fr/lady_jane.xml +share/gnome/help/aisleriot/fr/legal.xml +share/gnome/help/aisleriot/fr/maze.xml +share/gnome/help/aisleriot/fr/monte_carlo.xml +share/gnome/help/aisleriot/fr/neighbor.xml +share/gnome/help/aisleriot/fr/odessa.xml +share/gnome/help/aisleriot/fr/osmosis.xml +share/gnome/help/aisleriot/fr/peek.xml +share/gnome/help/aisleriot/fr/pileon.xml +share/gnome/help/aisleriot/fr/plait.xml +share/gnome/help/aisleriot/fr/poker.xml +share/gnome/help/aisleriot/fr/quatorze.xml +share/gnome/help/aisleriot/fr/royal_east.xml +share/gnome/help/aisleriot/fr/scorpion.xml +share/gnome/help/aisleriot/fr/scuffle.xml +share/gnome/help/aisleriot/fr/seahaven.xml +share/gnome/help/aisleriot/fr/sir_tommy.xml +share/gnome/help/aisleriot/fr/spider.xml +share/gnome/help/aisleriot/fr/spider_one_suit.xml +share/gnome/help/aisleriot/fr/spider_two_suit.xml +share/gnome/help/aisleriot/fr/spiderette.xml +share/gnome/help/aisleriot/fr/straight_up.xml +share/gnome/help/aisleriot/fr/streets_and_alleys.xml +share/gnome/help/aisleriot/fr/ten_across.xml +share/gnome/help/aisleriot/fr/thieves.xml +share/gnome/help/aisleriot/fr/thirteen.xml +share/gnome/help/aisleriot/fr/thumb_and_pouch.xml +share/gnome/help/aisleriot/fr/treize.xml +share/gnome/help/aisleriot/fr/union_square.xml +share/gnome/help/aisleriot/fr/valentine.xml +share/gnome/help/aisleriot/fr/westhaven.xml +share/gnome/help/aisleriot/fr/whitehead.xml +share/gnome/help/aisleriot/fr/will_o_the_wisp.xml +share/gnome/help/aisleriot/fr/yield.xml +share/gnome/help/aisleriot/fr/yukon.xml +share/gnome/help/aisleriot/fr/zebra.xml share/gnome/help/blackjack/C/blackjack.xml share/gnome/help/blackjack/C/figures/blackjack_start_window.png share/gnome/help/blackjack/C/figures/blackjack_win_window.png @@ -302,19 +401,17 @@ share/gnome/help/mahjongg/C/figures/mahjongg.png share/gnome/help/mahjongg/C/figures/no-match.png share/gnome/help/mahjongg/C/figures/no-move.png share/gnome/help/mahjongg/C/figures/preferences.png -share/gnome/help/mahjongg/C/figures/seed.png share/gnome/help/mahjongg/C/figures/toolbar.png share/gnome/help/mahjongg/C/legal.xml share/gnome/help/mahjongg/C/mahjongg.xml -share/gnome/help/same-gnome/C/figures/blink-sync.png -share/gnome/help/same-gnome/C/figures/preferences.png -share/gnome/help/same-gnome/C/figures/same-main-window.png -share/gnome/help/same-gnome/C/figures/same-planets-fig.png +share/gnome/help/same-gnome/C/figures/play.png +share/gnome/help/same-gnome/C/figures/start-up.png share/gnome/help/same-gnome/C/legal.xml share/gnome/help/same-gnome/C/same-gnome.xml share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/omf/gnome-games/aisleriot-C.omf +share/gnome/omf/gnome-games/aisleriot-fr.omf share/gnome/omf/gnome-games/blackjack-C.omf share/gnome/omf/gnome-games/gataxx-C.omf share/gnome/omf/gnome-games/glines-C.omf @@ -341,7 +438,7 @@ share/gnome/pixmaps/blackjack/chip-100.svg share/gnome/pixmaps/blackjack/chip-25.svg share/gnome/pixmaps/blackjack/chip-5.svg share/gnome/pixmaps/cards/baize.png -share/gnome/pixmaps/cards/slot.png +share/gnome/pixmaps/cards/slot.svg share/gnome/pixmaps/cards/slots/white-outline.svg share/gnome/pixmaps/gataxx.png share/gnome/pixmaps/glines.png @@ -391,11 +488,11 @@ share/gnome/pixmaps/gnobots2/gnomes.png share/gnome/pixmaps/gnobots2/robots.png share/gnome/pixmaps/gnobots2/splat.png share/gnome/pixmaps/gnobots2/yahoo.png -share/gnome/pixmaps/gnome-games-common/cards/bonded.png -share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-aisleriot.png share/gnome/pixmaps/gnome-blackjack.png share/gnome/pixmaps/gnome-cardgame.png +share/gnome/pixmaps/gnome-games-common/cards/bonded.png +share/gnome/pixmaps/gnome-games-common/cards/paris.svg share/gnome/pixmaps/gnome-gnobots2.png share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-gnotravex.png @@ -434,7 +531,7 @@ share/gnome/pixmaps/gnomine/flag-question.svg share/gnome/pixmaps/gnomine/flag.svg share/gnome/pixmaps/gnomine/mine.svg share/gnome/pixmaps/gnotski-icon.png -share/gnome/pixmaps/gnotski.png +share/gnome/pixmaps/gnotski.svg share/gnome/pixmaps/gtali/gnome-dice-1.svg share/gnome/pixmaps/gtali/gnome-dice-2.svg share/gnome/pixmaps/gtali/gnome-dice-3.svg @@ -448,8 +545,6 @@ share/gnome/pixmaps/iagno/woodtrim.png share/gnome/pixmaps/mahjongg/postmodern.svg share/gnome/pixmaps/mahjongg/smooth.png share/gnome/pixmaps/rteleport.png -share/gnome/pixmaps/same-gnome/planets.png -share/gnome/pixmaps/same-gnome/stones.png share/gnome/pixmaps/teleport.png share/gnome/sol-games/agnes.scm share/gnome/sol-games/auld_lang_syne.scm @@ -616,7 +711,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/sounds/gnibbles @dirrm share/gnome/sol-games/glade @dirrm share/gnome/sol-games -@dirrm share/gnome/pixmaps/same-gnome @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno @dirrm share/gnome/pixmaps/gtali @@ -681,10 +775,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/blackjack/C/figures @dirrm share/gnome/help/blackjack/C @dirrm share/gnome/help/blackjack +@dirrm share/gnome/help/aisleriot/fr/figures +@dirrm share/gnome/help/aisleriot/fr @dirrm share/gnome/help/aisleriot/C/figures @dirrm share/gnome/help/aisleriot/C @dirrm share/gnome/help/aisleriot @dirrm share/gnome/gnome-stones +@dirrm share/gnome/gnome-games/same-gnome/themes/2.10 +@dirrm share/gnome/gnome-games/same-gnome/themes +@dirrm share/gnome/gnome-games/same-gnome +@dirrm share/gnome/gnome-games/mahjongg/maps +@dirrm share/gnome/gnome-games/mahjongg +@dirrm share/gnome/gnome-games @dirrm share/gnome/gnobots2 @dirrm share/gnome/gnibbles @dirrm share/gnome/gnect diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index ffe019d9203e..e62f13025254 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -6,11 +6,10 @@ # PORTNAME= eog -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.9.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -19,7 +18,7 @@ COMMENT= The Eye Of Gnome image viewer USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeprintui \ +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui \ librsvg2 desktopfileutils libgnomeui USE_X_PREFIX= yes INSTALLS_OMF= yes diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo index 224d1571117e..99853195931e 100644 --- a/graphics/eog/distinfo +++ b/graphics/eog/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eog-2.8.2.tar.bz2) = 1edf5f0e48fe17468c2d67c56e14c437 -SIZE (gnome2/eog-2.8.2.tar.bz2) = 849212 +MD5 (gnome2/eog-2.9.0.tar.bz2) = be4c2b1dcb1457069d03bf282fccf54b +SIZE (gnome2/eog-2.9.0.tar.bz2) = 843143 diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist index 61b80e5a1daa..52a7dd9f2196 100644 --- a/graphics/eog/pkg-plist +++ b/graphics/eog/pkg-plist @@ -1,8 +1,8 @@ bin/eog share/gnome/applications/eog.desktop @exec update-desktop-database > /dev/null || /usr/bin/true +share/gnome/eog/eog-gtk-ui.xml share/gnome/eog/glade/eog.glade -share/gnome/gnome-2.0/ui/eog-gtk-ui.xml share/gnome/help/eog/C/eog.xml share/gnome/help/eog/C/figures/eog_save_as_window.png share/gnome/help/eog/C/figures/eog_start_window.png @@ -128,9 +128,6 @@ share/locale/vi/LC_MESSAGES/eog.mo share/locale/wa/LC_MESSAGES/eog.mo share/locale/zh_CN/LC_MESSAGES/eog.mo share/locale/zh_TW/LC_MESSAGES/eog.mo -share/locale/zu/LC_MESSAGES/eog.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @dirrm share/gnome/pixmaps/eog @dirrm share/gnome/omf/eog @dirrm share/gnome/help/eog/zh_TW/figures @@ -158,6 +155,4 @@ share/locale/zu/LC_MESSAGES/eog.mo @dirrm share/gnome/help/eog @dirrm share/gnome/eog/glade @dirrm share/gnome/eog -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile index 27f483028ba2..f9a9e248b18e 100644 --- a/graphics/gpdf/Makefile +++ b/graphics/gpdf/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gpdf -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= graphics print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -29,6 +28,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GCONF_SCHEMAS= gpdf.schemas post-install: - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.mk> diff --git a/graphics/gpdf/distinfo b/graphics/gpdf/distinfo index 7c747257c1e0..9eb8b6dfa555 100644 --- a/graphics/gpdf/distinfo +++ b/graphics/gpdf/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gpdf-2.8.3.tar.bz2) = c12d3cbf57611286ab80ee4febe2afdd -SIZE (gnome2/gpdf-2.8.3.tar.bz2) = 1055393 +MD5 (gnome2/gpdf-2.10.0.tar.bz2) = 9278cd3b9d06e3b1d364452f0e512fa9 +SIZE (gnome2/gpdf-2.10.0.tar.bz2) = 1079944 diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist index b5c1ad62aaa7..0a67e02da255 100644 --- a/graphics/gpdf/pkg-plist +++ b/graphics/gpdf/pkg-plist @@ -46,6 +46,7 @@ share/locale/en_CA/LC_MESSAGES/gpdf.mo share/locale/en_GB/LC_MESSAGES/gpdf.mo share/locale/eo/LC_MESSAGES/gpdf.mo share/locale/es/LC_MESSAGES/gpdf.mo +share/locale/et/LC_MESSAGES/gpdf.mo share/locale/eu/LC_MESSAGES/gpdf.mo share/locale/fa/LC_MESSAGES/gpdf.mo share/locale/fi/LC_MESSAGES/gpdf.mo @@ -70,6 +71,7 @@ share/locale/ml/LC_MESSAGES/gpdf.mo share/locale/mn/LC_MESSAGES/gpdf.mo share/locale/ms/LC_MESSAGES/gpdf.mo share/locale/nb/LC_MESSAGES/gpdf.mo +share/locale/ne/LC_MESSAGES/gpdf.mo share/locale/nl/LC_MESSAGES/gpdf.mo share/locale/nn/LC_MESSAGES/gpdf.mo share/locale/no/LC_MESSAGES/gpdf.mo diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index a7c0c549d1e2..a1f2ab8690c5 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomecanvas -PORTVERSION= 2.8.0 +PORTVERSION= 2.10.0 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo index ddc4ebce2feb..4743842c100f 100644 --- a/graphics/libgnomecanvas/distinfo +++ b/graphics/libgnomecanvas/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 2bf10396a92777e7b64b6052a8a232f1 -SIZE (gnome2/libgnomecanvas-2.8.0.tar.bz2) = 578849 +MD5 (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 88aac06c8dfd24671db3fe3bf881b5fc +SIZE (gnome2/libgnomecanvas-2.10.0.tar.bz2) = 575503 diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist index 642eafb250db..5e48d93c6b44 100644 --- a/graphics/libgnomecanvas/pkg-plist +++ b/graphics/libgnomecanvas/pkg-plist @@ -15,36 +15,37 @@ 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.800 +lib/libgnomecanvas-2.so.1000 libdata/pkgconfig/libgnomecanvas-2.0.pc -share/doc/libgnomecanvas/GnomeCanvas.html -share/doc/libgnomecanvas/GnomeCanvasBpath.html -share/doc/libgnomecanvas/GnomeCanvasClipgroup.html -share/doc/libgnomecanvas/GnomeCanvasEllipse.html -share/doc/libgnomecanvas/GnomeCanvasGroup.html -share/doc/libgnomecanvas/GnomeCanvasItem.html -share/doc/libgnomecanvas/GnomeCanvasLine.html -share/doc/libgnomecanvas/GnomeCanvasPixbuf.html -share/doc/libgnomecanvas/GnomeCanvasPolygon.html -share/doc/libgnomecanvas/GnomeCanvasRE.html -share/doc/libgnomecanvas/GnomeCanvasRect.html -share/doc/libgnomecanvas/GnomeCanvasRichText.html -share/doc/libgnomecanvas/GnomeCanvasShape.html -share/doc/libgnomecanvas/GnomeCanvasText.html -share/doc/libgnomecanvas/GnomeCanvasWidget.html -share/doc/libgnomecanvas/ch01.html -share/doc/libgnomecanvas/ch02.html -share/doc/libgnomecanvas/home.png -share/doc/libgnomecanvas/index.html -share/doc/libgnomecanvas/index.sgml -share/doc/libgnomecanvas/left.png -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html -share/doc/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html -share/doc/libgnomecanvas/libgnomecanvas.devhelp -share/doc/libgnomecanvas/right.png -share/doc/libgnomecanvas/style.css -share/doc/libgnomecanvas/up.png +%%DOCSDIR%%/GnomeCanvas.html +%%DOCSDIR%%/GnomeCanvasBpath.html +%%DOCSDIR%%/GnomeCanvasClipgroup.html +%%DOCSDIR%%/GnomeCanvasEllipse.html +%%DOCSDIR%%/GnomeCanvasGroup.html +%%DOCSDIR%%/GnomeCanvasItem.html +%%DOCSDIR%%/GnomeCanvasLine.html +%%DOCSDIR%%/GnomeCanvasPixbuf.html +%%DOCSDIR%%/GnomeCanvasPolygon.html +%%DOCSDIR%%/GnomeCanvasRE.html +%%DOCSDIR%%/GnomeCanvasRect.html +%%DOCSDIR%%/GnomeCanvasRichText.html +%%DOCSDIR%%/GnomeCanvasShape.html +%%DOCSDIR%%/GnomeCanvasText.html +%%DOCSDIR%%/GnomeCanvasWidget.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/ch02.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-path-def.html +%%DOCSDIR%%/libgnomecanvas-gnome-canvas-util.html +%%DOCSDIR%%/libgnomecanvas.devhelp +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/ang/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 @@ -108,10 +109,15 @@ share/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/uk/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/vi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo +share/locale/xh/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo -@dirrm share/doc/libgnomecanvas +@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true +@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ang 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm lib/libglade/2.0 @dirrm lib/libglade @dirrm include/libgnomecanvas-2.0/libgnomecanvas diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index b936beb8cb5b..d13ef9beb3cd 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -6,11 +6,11 @@ # PORTNAME= librsvg2 -PORTVERSION= 2.8.1 +PORTVERSION= 2.9.5 PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9 DISTNAME= librsvg-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -29,13 +29,13 @@ USE_X_PREFIX= yes INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes -USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gnomevfs2 +WANT_GNOME= yes +USE_GNOME= gnomehack gnomeprefix libartlgpl2 libgsf gtk20 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-svgz \ --disable-gtk-doc \ --without-gimp \ - --enable-gnome-vfs \ --with-croco CROCO_VERSION= 0.6 @@ -47,8 +47,20 @@ MAN1= rsvg.1 OPTIONS= MOZILLA_PLUGIN "Enable the RSVG browser plug-in" no +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> +.if ${HAVE_GNOME:Mgnomevfs2}!="" +USE_GNOME+= gnomevfs2 +CONFIGURE_ARGS+=--enable-gnome-vfs +.else +CONFIGURE_ARGS+=--disable-gnome-vfs +.endif + .if defined(WITH_MOZILLA_PLUGIN) .if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox" BUILD_DEPENDS+= ${X11BASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox @@ -81,6 +93,14 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in PLIST_SUB+= PLUGIN="@comment " .endif +.if ${OSVERSION} < 500000 +.if defined(WITH_MOZILLA) +.if ${WITH_MOZILLA}=="mozilla-devel" +USE_GCC= 3.4 +.endif +.endif +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/librsvg-2.0.pc.in @@ -93,6 +113,9 @@ post-patch: .endif .endif +pre-build: + @${REINPLACE_CMD} -E -e 's|O2|O|g' ${WRKSRC}/Makefile + .if defined(WITH_MOZILLA_PLUGIN) post-install: ${MKDIR} ${PREFIX}/lib/browser_plugins diff --git a/graphics/librsvg2/distinfo b/graphics/librsvg2/distinfo index 567866d8a371..40f8c84a55e4 100644 --- a/graphics/librsvg2/distinfo +++ b/graphics/librsvg2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/librsvg-2.8.1.tar.bz2) = 01c14f6adcf3a71be2b808879e1223a0 -SIZE (gnome2/librsvg-2.8.1.tar.bz2) = 361446 +MD5 (gnome2/librsvg-2.9.5.tar.bz2) = 44799d75e940eb4150acdae4f63cbe2a +SIZE (gnome2/librsvg-2.9.5.tar.bz2) = 392785 diff --git a/graphics/librsvg2/files/extra-patch-Makefile.in b/graphics/librsvg2/files/extra-patch-Makefile.in index 27c8fcd2988f..6bcb7ef6882e 100644 --- a/graphics/librsvg2/files/extra-patch-Makefile.in +++ b/graphics/librsvg2/files/extra-patch-Makefile.in @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Sep 3 00:54:51 2004 -+++ Makefile.in Fri Sep 3 00:55:00 2004 -@@ -307,7 +307,7 @@ +--- Makefile.in.orig Wed Jan 26 04:47:10 2005 ++++ Makefile.in Wed Jan 26 04:47:24 2005 +@@ -199,7 +199,7 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = . gtk-engine gdk-pixbuf-loader moz-plugin doc data +SUBDIRS = . gtk-engine gdk-pixbuf-loader doc data - @HAVE_GTK_FALSE@target_rsvg_view = + @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view - man_MANS = rsvg.1 + @HAVE_GTK_FALSE@target_rsvg_view = diff --git a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in index 1f570b2472c2..97a0a3fd20e0 100644 --- a/graphics/librsvg2/files/patch-moz-plugin_Makefile.in +++ b/graphics/librsvg2/files/patch-moz-plugin_Makefile.in @@ -1,25 +1,25 @@ ---- moz-plugin/Makefile.in.orig Fri Sep 3 01:07:24 2004 -+++ moz-plugin/Makefile.in Fri Sep 3 01:08:00 2004 -@@ -282,15 +282,15 @@ - $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +--- moz-plugin/Makefile.in.orig Tue Jan 25 23:31:56 2005 ++++ moz-plugin/Makefile.in Tue Jan 25 23:32:32 2005 +@@ -252,15 +252,15 @@ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) + pluginLTLIBRARIES_INSTALL = $(INSTALL) install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) - @$(NORMAL_INSTALL) -- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" +- $(mkinstalldirs) $(DESTDIR)$(plugindir) - @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ -- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ +- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ +- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ - else :; fi; \ - done +# @$(NORMAL_INSTALL) -+# test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)" ++# $(mkinstalldirs) $(DESTDIR)$(plugindir) +# @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \ +# if test -f $$p; then \ +# f="`echo $$p | sed -e 's|^.*/||'`"; \ -+# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(plugindir)/$$f'"; \ -+# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(plugindir)/$$f"; \ ++# echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \ ++# $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \ +# else :; fi; \ +# done diff --git a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c b/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c deleted file mode 100644 index f75959a2a4ef..000000000000 --- a/graphics/librsvg2/files/patch-moz-plugin_moz-plugin.c +++ /dev/null @@ -1,15 +0,0 @@ ---- moz-plugin/moz-plugin.c.orig Fri Sep 3 00:48:45 2004 -+++ moz-plugin/moz-plugin.c Fri Sep 3 00:49:35 2004 -@@ -26,9 +26,12 @@ - #include <config.h> - - #include <stdio.h> -+#ifdef HAVE_STDINT_H - #include <stdint.h> -+#endif - #include <unistd.h> - #include <sys/wait.h> -+#include <signal.h> - - #include <X11/Xlib.h> - #include <X11/Intrinsic.h> diff --git a/graphics/librsvg2/files/patch-rsvg-paint-server.c b/graphics/librsvg2/files/patch-rsvg-paint-server.c new file mode 100644 index 000000000000..f6e05c030dc4 --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-paint-server.c @@ -0,0 +1,14 @@ +--- rsvg-paint-server.c.orig Tue Jan 25 23:39:10 2005 ++++ rsvg-paint-server.c Tue Jan 25 23:39:19 2005 +@@ -84,10 +84,10 @@ + const RsvgPSCtx *ctx) + { + RsvgPaintServerSolid *z = (RsvgPaintServerSolid *)self; ++ ArtPixMaxDepth color[3]; + guint32 rgb = z->rgb; + if (z->currentcolour) + rgb = rsvg_state_current(ctx->ctx)->current_color; +- ArtPixMaxDepth color[3]; + + color[0] = ART_PIX_MAX_FROM_8 (rgb >> 16); + color[1] = ART_PIX_MAX_FROM_8 ((rgb >> 8) & 0xff); diff --git a/graphics/librsvg2/files/patch-rsvg-shapes.c b/graphics/librsvg2/files/patch-rsvg-shapes.c new file mode 100644 index 000000000000..2642a2539b36 --- /dev/null +++ b/graphics/librsvg2/files/patch-rsvg-shapes.c @@ -0,0 +1,14 @@ +--- rsvg-shapes.c.orig Tue Jan 25 23:43:50 2005 ++++ rsvg-shapes.c Tue Jan 25 23:44:01 2005 +@@ -2579,10 +2579,10 @@ + const char * id, *value; + double vbox_x = 0, vbox_y = 0, vbox_w = 0, vbox_h = 0; + gboolean has_vbox = FALSE, overflow = 0; +- id = NULL; + RsvgDefsDrawableSvg * svg; + RsvgDefsDrawableGroup * group; + RsvgState state; ++ id = NULL; + rsvg_state_init(&state); + + if (rsvg_property_bag_size (atts)) diff --git a/graphics/librsvg2/pkg-plist b/graphics/librsvg2/pkg-plist index ef193121ef5f..5604203a5e03 100644 --- a/graphics/librsvg2/pkg-plist +++ b/graphics/librsvg2/pkg-plist @@ -1,5 +1,6 @@ bin/rsvg bin/rsvg-view +include/librsvg-2/librsvg/librsvg-enum-types.h include/librsvg-2/librsvg/librsvg-features.h include/librsvg-2/librsvg/rsvg-gz.h include/librsvg-2/librsvg/rsvg.h @@ -8,7 +9,7 @@ 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.10 +lib/librsvg-2.so.11 libdata/pkgconfig/librsvg-2.0.pc share/doc/librsvg/html/home.png share/doc/librsvg/html/index.html diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index f8f815e4531a..90ba22ac5525 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ximian -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.2 PKGNAMESUFFIX= -connector DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -26,13 +26,13 @@ USE_GMAKE= yes USE_OPENLDAP= yes USE_GNOME= gnomeprefix intlhack gnomehack gnometarget CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -rpath ${X11BASE}/lib/evolution/${EVO_VERSION}" + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -EVO_VERSION= 2.0 -PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} +EVO_VERSION= 2.2 +PLIST_SUB= VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" .include <bsd.port.pre.mk> @@ -48,4 +48,8 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} .endif .endif +.if ${ARCH} == "amd64" +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +.endif + .include <bsd.port.post.mk> diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo index 0bca663c9c31..bf1166cc4bf2 100644 --- a/mail/evolution-exchange/distinfo +++ b/mail/evolution-exchange/distinfo @@ -1,2 +1,2 @@ -MD5 (ximian-connector-2.0.4.tar.bz2) = 726499c226b0932882dffe76869e9031 -SIZE (ximian-connector-2.0.4.tar.bz2) = 1202829 +MD5 (ximian-connector-2.2.0.tar.bz2) = 10ee14a8670c36c24f1d13021257c0ce +SIZE (ximian-connector-2.2.0.tar.bz2) = 1242512 diff --git a/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c b/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c new file mode 100644 index 000000000000..7436ca9fe8f6 --- /dev/null +++ b/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c @@ -0,0 +1,16 @@ +--- storage/e-folder-exchange.c.orig Tue Jan 25 21:31:32 2005 ++++ storage/e-folder-exchange.c Tue Jan 25 21:31:52 2005 +@@ -689,11 +689,12 @@ + void + e_folder_exchange_unsubscribe (EFolder *folder) + { ++ E2kContext *ctx; + g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder)); + + /* FIXME : This is a hack as of now. The free_folder in mail-stub + gets called when we are in offline and the context is NULL then. */ +- E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); ++ ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); + if (ctx) { + e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder), + E_FOLDER_EXCHANGE_URI (folder)); diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist index ac4581fd4159..c43d25bf769c 100644 --- a/mail/evolution-exchange/pkg-plist +++ b/mail/evolution-exchange/pkg-plist @@ -1,45 +1,17 @@ bin/ximian-connector-setup-%%VERSION%% -lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so -lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls +lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so +lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -%%DOCSDIR%%/E2kContext.html -%%DOCSDIR%%/E2kGlobalCatalog.html -%%DOCSDIR%%/E2kSecurityDescriptor.html -%%DOCSDIR%%/E2kSid.html -%%DOCSDIR%%/E2kUserDialog.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/up.png -%%DOCSDIR%%/ximian-connector-e2k-action.html -%%DOCSDIR%%/ximian-connector-e2k-autoconfig.html -%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html -%%DOCSDIR%%/ximian-connector-e2k-freebusy.html -%%DOCSDIR%%/ximian-connector-e2k-http-utils.html -%%DOCSDIR%%/ximian-connector-e2k-properties.html -%%DOCSDIR%%/ximian-connector-e2k-restriction.html -%%DOCSDIR%%/ximian-connector-e2k-result.html -%%DOCSDIR%%/ximian-connector-e2k-rule-xml.html -%%DOCSDIR%%/ximian-connector-e2k-rule.html -%%DOCSDIR%%/ximian-connector-e2k-uri.html -%%DOCSDIR%%/ximian-connector-e2k-utils.html -%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html -%%DOCSDIR%%/ximian-connector-test-utils.html -%%DOCSDIR%%/ximian-connector-xntlm-des.html -%%DOCSDIR%%/ximian-connector-xntlm-md4.html -%%DOCSDIR%%/ximian-connector-xntlm.html -%%DOCSDIR%%/ximian-connector.devhelp share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png share/gnome/ximian-connector/%%VERSION%%/images/connector.png @@ -51,8 +23,6 @@ share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/cy/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo @@ -61,10 +31,12 @@ share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index c376f25d89ed..ed66989ed14a 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -6,10 +6,10 @@ # PORTNAME= evolution -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES= mail 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 @@ -22,17 +22,16 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gal2 \ gtkhtml3 desktopfileutils USE_REINPLACE= yes USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes CONFIGURE_ARGS= --enable-nss=yes \ --with-nss-includes=${LOCALBASE}/include/nss/nss \ --with-nss-libs=${LOCALBASE}/lib \ --with-nspr-includes=${LOCALBASE}/include/nspr \ --with-nspr-libs=${LOCALBASE}/lib \ - --enable-openssl=no \ --with-sub-version=" FreeBSD GNOME Team Port" \ --with-krb5=/usr CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -43,9 +42,9 @@ GCONF_SCHEMAS= apps_evolution_addressbook-${EVO_VERSION}.schemas \ apps_evolution_shell-${EVO_VERSION}.schemas \ evolution-mail-${EVO_VERSION}.schemas -EVO_VERSION= 2.0 +EVO_VERSION= 2.2 PLIST_SUB= VERSION=${EVO_VERSION} \ - PORTVERSION=2.0 + PORTVERSION=2.2 OPTIONS= PILOT "Enable Palm Pilot sync support" off \ LDAP "Enable LDAP support" on \ @@ -53,6 +52,15 @@ OPTIONS= PILOT "Enable Palm Pilot sync support" off \ .include <bsd.port.pre.mk> +.if exists(${X11BASE}/lib/libgstreamer-0.8.so.5) || \ + defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +WITH_GSTREAMER= yes +.endif + +.if exists(${LOCALBASE}/lib/libdbus-glib-1.so) +WITH_DBUS= yes +.endif + .if defined(WITH_PILOT) LIB_DEPENDS+= gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2 CONFIGURE_ARGS+= --with-pisock=${LOCALBASE} \ @@ -73,8 +81,21 @@ CONFIGURE_ARGS+=--with-openldap=no RUN_DEPENDS+= spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin .endif +.if defined(WITH_GSTREAMER) +LIB_DEPENDS+= gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer +PLIST_SUB+= GSTREAMER="" +.else +PLIST_SUB+= GSTREAMER="@comment " +.endif + +.if defined(WITH_DBUS) +LIB_DEPENDS+= dbus-glib-1.0:${PORTSDIR}/devel/dbus +PLIST_SUB+= DBUS="" +.else +PLIST_SUB+= DBUS="@comment " +.endif + post-install: - @${CHMOD} u+w ${PREFIX}/share/gnome/evolution/${EVO_VERSION}/default/C/mail/local/Inbox @${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \ ${PREFIX}/bin/evolution diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo index 68f7fcada8b8..8455a3c931a9 100644 --- a/mail/evolution/distinfo +++ b/mail/evolution/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/evolution-2.0.4.tar.bz2) = e5b9bbab0d1f888ce9de41b57989eaa7 -SIZE (gnome2/evolution-2.0.4.tar.bz2) = 15395184 +MD5 (gnome2/evolution-2.2.0.tar.bz2) = a93991fb80c7fa88f6758661c8931f6b +SIZE (gnome2/evolution-2.2.0.tar.bz2) = 13344133 diff --git a/mail/evolution/files/patch-camel::camel-store.h b/mail/evolution/files/patch-camel::camel-store.h deleted file mode 100644 index ee23828d6428..000000000000 --- a/mail/evolution/files/patch-camel::camel-store.h +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- camel/camel-store.h 2001/09/04 16:45:47 1.1 -+++ camel/camel-store.h 2001/09/04 16:46:32 -@@ -33,6 +33,7 @@ - #pragma } - #endif /* __cplusplus }*/ - -+#include <sys/types.h> - #include <camel/camel-object.h> - #include <camel/camel-service.h> - diff --git a/mail/evolution/files/patch-camel_Makefile.in b/mail/evolution/files/patch-camel_Makefile.in deleted file mode 100644 index a4250e85cbb3..000000000000 --- a/mail/evolution/files/patch-camel_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- camel/Makefile.in.orig Tue Dec 30 00:44:37 2003 -+++ camel/Makefile.in Tue Dec 30 00:44:45 2003 -@@ -221,7 +221,7 @@ - soundsdir = @soundsdir@ - viewsdir = @viewsdir@ - --SUBDIRS = . providers tests -+SUBDIRS = . providers - - libcamelincludedir = $(privincludedir)/camel - diff --git a/mail/evolution/files/patch-camel_camel-mime-utils.c b/mail/evolution/files/patch-camel_camel-mime-utils.c deleted file mode 100644 index 33111196a800..000000000000 --- a/mail/evolution/files/patch-camel_camel-mime-utils.c +++ /dev/null @@ -1,11 +0,0 @@ ---- camel/camel-mime-utils.c.orig Fri May 3 15:47:41 2002 -+++ camel/camel-mime-utils.c Sun May 5 18:09:24 2002 -@@ -3388,6 +3388,8 @@ - } - d(printf("named offset = %d\n", offset)); - } -+ -+ tm.tm_isdst = -1; - - t = mktime(&tm); - #if defined(HAVE_TIMEZONE) diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c new file mode 100644 index 000000000000..6aa2e9a13838 --- /dev/null +++ b/mail/evolution/files/patch-mail_em-migrate.c @@ -0,0 +1,11 @@ +--- mail/em-migrate.c.orig Tue Dec 21 15:09:30 2004 ++++ mail/em-migrate.c Tue Dec 21 15:09:46 2004 +@@ -1447,7 +1447,7 @@ + ut.actime = st.st_atime; + ut.modtime = st.st_mtime; + utime (dest, &ut); +- chmod (dest, st.st_mode); ++ chmod (dest, st.st_mode | S_IWUSR); + + return 0; + diff --git a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c new file mode 100644 index 000000000000..8d880e79f05a --- /dev/null +++ b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c @@ -0,0 +1,14 @@ +--- plugins/exchange-account-setup/exchange-account-setup.c.orig Tue Mar 1 15:38:29 2005 ++++ plugins/exchange-account-setup/exchange-account-setup.c Tue Mar 1 15:38:45 2005 +@@ -564,9 +564,10 @@ + org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data) + { + EMConfigTargetAccount *target_account; +- target_account = (EMConfigTargetAccount *)data->config->target; + const char *source_url; + CamelURL *url; ++ ++ target_account = (EMConfigTargetAccount *)data->config->target; + + source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL); + url = camel_url_new (source_url, NULL); diff --git a/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c new file mode 100644 index 000000000000..f2389bd047f1 --- /dev/null +++ b/mail/evolution/files/patch-widgets_misc_e-multi-config-dialog.c @@ -0,0 +1,19 @@ +--- widgets/misc/e-multi-config-dialog.c.orig Tue Nov 23 15:53:34 2004 ++++ widgets/misc/e-multi-config-dialog.c Tue Nov 23 15:54:02 2004 +@@ -396,6 +396,7 @@ + { + EMultiConfigDialogPrivate *priv; + AtkObject *a11y; ++ AtkObject *a11yPage; + gint page_no; + + g_return_if_fail (E_IS_MULTI_CONFIG_DIALOG (dialog)); +@@ -418,7 +419,7 @@ + NULL); + + a11y = gtk_widget_get_accessible (GTK_WIDGET(priv->notebook)); +- AtkObject *a11yPage = atk_object_ref_accessible_child (a11y, page_no); ++ a11yPage = atk_object_ref_accessible_child (a11y, page_no); + if (a11yPage != NULL) { + if (atk_object_get_role (a11yPage) == ATK_ROLE_PAGE_TAB) + atk_object_set_name (a11yPage, title); diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist index 31929b7e9a09..62803eb553b0 100644 --- a/mail/evolution/pkg-plist +++ b/mail/evolution/pkg-plist @@ -1,144 +1,6 @@ bin/evolution bin/evolution-%%VERSION%% -include/evolution-%%VERSION%%/camel/broken-date-parser.h -include/evolution-%%VERSION%%/camel/camel-address.h -include/evolution-%%VERSION%%/camel/camel-arg.h -include/evolution-%%VERSION%%/camel/camel-block-file.h -include/evolution-%%VERSION%%/camel/camel-certdb.h -include/evolution-%%VERSION%%/camel/camel-charset-map.h -include/evolution-%%VERSION%%/camel/camel-cipher-context.h -include/evolution-%%VERSION%%/camel/camel-data-cache.h -include/evolution-%%VERSION%%/camel/camel-data-wrapper.h -include/evolution-%%VERSION%%/camel/camel-debug.h -include/evolution-%%VERSION%%/camel/camel-digest-folder.h -include/evolution-%%VERSION%%/camel/camel-digest-store.h -include/evolution-%%VERSION%%/camel/camel-digest-summary.h -include/evolution-%%VERSION%%/camel/camel-disco-diary.h -include/evolution-%%VERSION%%/camel/camel-disco-folder.h -include/evolution-%%VERSION%%/camel/camel-disco-store.h -include/evolution-%%VERSION%%/camel/camel-exception-list.def -include/evolution-%%VERSION%%/camel/camel-exception.h -include/evolution-%%VERSION%%/camel/camel-file-utils.h -include/evolution-%%VERSION%%/camel/camel-filter-driver.h -include/evolution-%%VERSION%%/camel/camel-filter-search.h -include/evolution-%%VERSION%%/camel/camel-folder-search.h -include/evolution-%%VERSION%%/camel/camel-folder-summary.h -include/evolution-%%VERSION%%/camel/camel-folder-thread.h -include/evolution-%%VERSION%%/camel/camel-folder.h -include/evolution-%%VERSION%%/camel/camel-gpg-context.h -include/evolution-%%VERSION%%/camel/camel-http-stream.h -include/evolution-%%VERSION%%/camel/camel-i18n.h -include/evolution-%%VERSION%%/camel/camel-imap-command.h -include/evolution-%%VERSION%%/camel/camel-imap-folder.h -include/evolution-%%VERSION%%/camel/camel-imap-message-cache.h -include/evolution-%%VERSION%%/camel/camel-imap-search.h -include/evolution-%%VERSION%%/camel/camel-imap-store-summary.h -include/evolution-%%VERSION%%/camel/camel-imap-store.h -include/evolution-%%VERSION%%/camel/camel-imap-summary.h -include/evolution-%%VERSION%%/camel/camel-imap-types.h -include/evolution-%%VERSION%%/camel/camel-imap-utils.h -include/evolution-%%VERSION%%/camel/camel-imap-wrapper.h -include/evolution-%%VERSION%%/camel/camel-index.h -include/evolution-%%VERSION%%/camel/camel-internet-address.h -include/evolution-%%VERSION%%/camel/camel-junk-plugin.h -include/evolution-%%VERSION%%/camel/camel-local-folder.h -include/evolution-%%VERSION%%/camel/camel-local-store.h -include/evolution-%%VERSION%%/camel/camel-local-summary.h -include/evolution-%%VERSION%%/camel/camel-lock-client.h -include/evolution-%%VERSION%%/camel/camel-lock.h -include/evolution-%%VERSION%%/camel/camel-maildir-folder.h -include/evolution-%%VERSION%%/camel/camel-maildir-store.h -include/evolution-%%VERSION%%/camel/camel-maildir-summary.h -include/evolution-%%VERSION%%/camel/camel-mbox-folder.h -include/evolution-%%VERSION%%/camel/camel-mbox-store.h -include/evolution-%%VERSION%%/camel/camel-mbox-summary.h -include/evolution-%%VERSION%%/camel/camel-medium.h -include/evolution-%%VERSION%%/camel/camel-mh-folder.h -include/evolution-%%VERSION%%/camel/camel-mh-store.h -include/evolution-%%VERSION%%/camel/camel-mh-summary.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-basic.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-bestenc.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-canon.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-charset.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-crlf.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-enriched.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-from.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-gzip.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-html.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-index.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-linewrap.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-save.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-tohtml.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-windows.h -include/evolution-%%VERSION%%/camel/camel-mime-filter-yenc.h -include/evolution-%%VERSION%%/camel/camel-mime-filter.h -include/evolution-%%VERSION%%/camel/camel-mime-message.h -include/evolution-%%VERSION%%/camel/camel-mime-parser.h -include/evolution-%%VERSION%%/camel/camel-mime-part-utils.h -include/evolution-%%VERSION%%/camel/camel-mime-part.h -include/evolution-%%VERSION%%/camel/camel-mime-utils.h -include/evolution-%%VERSION%%/camel/camel-movemail.h -include/evolution-%%VERSION%%/camel/camel-multipart-encrypted.h -include/evolution-%%VERSION%%/camel/camel-multipart-signed.h -include/evolution-%%VERSION%%/camel/camel-multipart.h -include/evolution-%%VERSION%%/camel/camel-nntp-folder.h -include/evolution-%%VERSION%%/camel/camel-nntp-resp-codes.h -include/evolution-%%VERSION%%/camel/camel-nntp-store-summary.h -include/evolution-%%VERSION%%/camel/camel-nntp-store.h -include/evolution-%%VERSION%%/camel/camel-nntp-stream.h -include/evolution-%%VERSION%%/camel/camel-nntp-summary.h -include/evolution-%%VERSION%%/camel/camel-object.h -include/evolution-%%VERSION%%/camel/camel-operation.h -include/evolution-%%VERSION%%/camel/camel-partition-table.h -include/evolution-%%VERSION%%/camel/camel-pop3-engine.h -include/evolution-%%VERSION%%/camel/camel-pop3-folder.h -include/evolution-%%VERSION%%/camel/camel-pop3-store.h -include/evolution-%%VERSION%%/camel/camel-pop3-stream.h -include/evolution-%%VERSION%%/camel/camel-provider.h -include/evolution-%%VERSION%%/camel/camel-sasl-anonymous.h -include/evolution-%%VERSION%%/camel/camel-sasl-cram-md5.h -include/evolution-%%VERSION%%/camel/camel-sasl-digest-md5.h -include/evolution-%%VERSION%%/camel/camel-sasl-gssapi.h -include/evolution-%%VERSION%%/camel/camel-sasl-kerberos4.h -include/evolution-%%VERSION%%/camel/camel-sasl-login.h -include/evolution-%%VERSION%%/camel/camel-sasl-ntlm.h -include/evolution-%%VERSION%%/camel/camel-sasl-plain.h -include/evolution-%%VERSION%%/camel/camel-sasl-popb4smtp.h -include/evolution-%%VERSION%%/camel/camel-sasl.h -include/evolution-%%VERSION%%/camel/camel-seekable-stream.h -include/evolution-%%VERSION%%/camel/camel-seekable-substream.h -include/evolution-%%VERSION%%/camel/camel-sendmail-transport.h -include/evolution-%%VERSION%%/camel/camel-service.h -include/evolution-%%VERSION%%/camel/camel-session.h -include/evolution-%%VERSION%%/camel/camel-smime-context.h -include/evolution-%%VERSION%%/camel/camel-smtp-transport.h -include/evolution-%%VERSION%%/camel/camel-spool-folder.h -include/evolution-%%VERSION%%/camel/camel-spool-store.h -include/evolution-%%VERSION%%/camel/camel-spool-summary.h -include/evolution-%%VERSION%%/camel/camel-store-summary.h -include/evolution-%%VERSION%%/camel/camel-store.h -include/evolution-%%VERSION%%/camel/camel-stream-buffer.h -include/evolution-%%VERSION%%/camel/camel-stream-filter.h -include/evolution-%%VERSION%%/camel/camel-stream-fs.h -include/evolution-%%VERSION%%/camel/camel-stream-mem.h -include/evolution-%%VERSION%%/camel/camel-stream-null.h -include/evolution-%%VERSION%%/camel/camel-stream-process.h -include/evolution-%%VERSION%%/camel/camel-stream.h -include/evolution-%%VERSION%%/camel/camel-string-utils.h -include/evolution-%%VERSION%%/camel/camel-tcp-stream-raw.h -include/evolution-%%VERSION%%/camel/camel-tcp-stream-ssl.h -include/evolution-%%VERSION%%/camel/camel-tcp-stream.h -include/evolution-%%VERSION%%/camel/camel-text-index.h -include/evolution-%%VERSION%%/camel/camel-transport.h -include/evolution-%%VERSION%%/camel/camel-types.h -include/evolution-%%VERSION%%/camel/camel-uid-cache.h -include/evolution-%%VERSION%%/camel/camel-url-scanner.h -include/evolution-%%VERSION%%/camel/camel-url.h -include/evolution-%%VERSION%%/camel/camel-utf8.h -include/evolution-%%VERSION%%/camel/camel-vee-folder.h -include/evolution-%%VERSION%%/camel/camel-vee-store.h -include/evolution-%%VERSION%%/camel/camel-vtrash-folder.h -include/evolution-%%VERSION%%/camel/camel.h +include/evolution-%%VERSION%%/calendar/gui/e-cal-config.h include/evolution-%%VERSION%%/e-conduit/e-pilot-map.h include/evolution-%%VERSION%%/e-conduit/e-pilot-util.h include/evolution-%%VERSION%%/e-util/e-account-list.h @@ -148,32 +10,30 @@ include/evolution-%%VERSION%%/e-util/e-categories-config.h include/evolution-%%VERSION%%/e-util/e-categories-master-list-wombat.h include/evolution-%%VERSION%%/e-util/e-component-listener.h include/evolution-%%VERSION%%/e-util/e-config-listener.h +include/evolution-%%VERSION%%/e-util/e-config.h include/evolution-%%VERSION%%/e-util/e-corba-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-utils.h include/evolution-%%VERSION%%/e-util/e-dialog-widgets.h +include/evolution-%%VERSION%%/e-util/e-event.h include/evolution-%%VERSION%%/e-util/e-folder-map.h include/evolution-%%VERSION%%/e-util/e-fsutils.h include/evolution-%%VERSION%%/e-util/e-gtk-utils.h include/evolution-%%VERSION%%/e-util/e-gui-utils.h -include/evolution-%%VERSION%%/e-util/e-host-utils.h include/evolution-%%VERSION%%/e-util/e-html-utils.h include/evolution-%%VERSION%%/e-util/e-icon-factory.h include/evolution-%%VERSION%%/e-util/e-iterator.h include/evolution-%%VERSION%%/e-util/e-list-iterator.h include/evolution-%%VERSION%%/e-util/e-list.h -include/evolution-%%VERSION%%/e-util/e-memory.h +include/evolution-%%VERSION%%/e-util/e-menu.h include/evolution-%%VERSION%%/e-util/e-mktemp.h -include/evolution-%%VERSION%%/e-util/e-msgport.h -include/evolution-%%VERSION%%/e-util/e-passwords.h -include/evolution-%%VERSION%%/e-util/e-path.h +include/evolution-%%VERSION%%/e-util/e-plugin.h +include/evolution-%%VERSION%%/e-util/e-popup.h +include/evolution-%%VERSION%%/e-util/e-print.h include/evolution-%%VERSION%%/e-util/e-request.h -include/evolution-%%VERSION%%/e-util/e-sexp.h include/evolution-%%VERSION%%/e-util/e-signature-list.h include/evolution-%%VERSION%%/e-util/e-signature.h include/evolution-%%VERSION%%/e-util/e-time-utils.h -include/evolution-%%VERSION%%/e-util/e-trie.h include/evolution-%%VERSION%%/e-util/e-uid.h -include/evolution-%%VERSION%%/e-util/e-url.h include/evolution-%%VERSION%%/e-util/md5-utils.h include/evolution-%%VERSION%%/importer/GNOME_Evolution_Importer.h include/evolution-%%VERSION%%/importer/evolution-importer-client.h @@ -208,26 +68,10 @@ include/evolution-%%VERSION%%/widgets/e-map.h include/evolution-%%VERSION%%/widgets/e-multi-config-dialog.h %%PILOT:%%include/evolution-%%VERSION%%/widgets/e-pilot-settings.h include/evolution-%%VERSION%%/widgets/e-search-bar.h -include/evolution-%%VERSION%%/widgets/e-source-option-menu.h -include/evolution-%%VERSION%%/widgets/e-source-selector.h +include/evolution-%%VERSION%%/widgets/e-send-options.h include/evolution-%%VERSION%%/widgets/e-task-bar.h include/evolution-%%VERSION%%/widgets/e-task-widget.h -include/evolution-%%VERSION%%/widgets/e-title-bar.h include/evolution-%%VERSION%%/widgets/e-url-entry.h -lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.so -lib/evolution/%%VERSION%%/camel-providers/libcamelgroupwise.urls -lib/evolution/%%VERSION%%/camel-providers/libcamelimap.so -lib/evolution/%%VERSION%%/camel-providers/libcamelimap.urls -lib/evolution/%%VERSION%%/camel-providers/libcamellocal.so -lib/evolution/%%VERSION%%/camel-providers/libcamellocal.urls -lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.so -lib/evolution/%%VERSION%%/camel-providers/libcamelnntp.urls -lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.so -lib/evolution/%%VERSION%%/camel-providers/libcamelpop3.urls -lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.so -lib/evolution/%%VERSION%%/camel-providers/libcamelsendmail.urls -lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.so -lib/evolution/%%VERSION%%/camel-providers/libcamelsmtp.urls lib/evolution/%%VERSION%%/components/libevolution-addressbook.so lib/evolution/%%VERSION%%/components/libevolution-calendar.so lib/evolution/%%VERSION%%/components/libevolution-mail.so @@ -237,21 +81,33 @@ lib/evolution/%%VERSION%%/components/libevolution-mail.so lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-ldif-importer.so lib/evolution/%%VERSION%%/evolution-addressbook-importers/libevolution-addressbook-vcard-importer.so lib/evolution/%%VERSION%%/evolution-calendar-importers/libevolution-calendar-importers.so -lib/evolution/%%VERSION%%/libcamel.a -lib/evolution/%%VERSION%%/libcamel.so -lib/evolution/%%VERSION%%/libcamel.so.0 +lib/evolution/%%VERSION%%/libeabutil.a +lib/evolution/%%VERSION%%/libeabutil.so +lib/evolution/%%VERSION%%/libeabutil.so.0 lib/evolution/%%VERSION%%/libeconduit.a lib/evolution/%%VERSION%%/libeconduit.so lib/evolution/%%VERSION%%/libeconduit.so.0 +lib/evolution/%%VERSION%%/libecontacteditor.a +lib/evolution/%%VERSION%%/libecontacteditor.so +lib/evolution/%%VERSION%%/libecontacteditor.so.0 +lib/evolution/%%VERSION%%/libecontactlisteditor.a +lib/evolution/%%VERSION%%/libecontactlisteditor.so +lib/evolution/%%VERSION%%/libecontactlisteditor.so.0 +lib/evolution/%%VERSION%%/libefilterbar.a +lib/evolution/%%VERSION%%/libefilterbar.so +lib/evolution/%%VERSION%%/libefilterbar.so.0 lib/evolution/%%VERSION%%/libemiscwidgets.a lib/evolution/%%VERSION%%/libemiscwidgets.so lib/evolution/%%VERSION%%/libemiscwidgets.so.0 -lib/evolution/%%VERSION%%/libeselectnames.a -lib/evolution/%%VERSION%%/libeselectnames.so -lib/evolution/%%VERSION%%/libeselectnames.so.0 lib/evolution/%%VERSION%%/libeshell.a lib/evolution/%%VERSION%%/libeshell.so lib/evolution/%%VERSION%%/libeshell.so.0 +lib/evolution/%%VERSION%%/libessmime.a +lib/evolution/%%VERSION%%/libessmime.so +lib/evolution/%%VERSION%%/libessmime.so.0 +lib/evolution/%%VERSION%%/libetimezonedialog.a +lib/evolution/%%VERSION%%/libetimezonedialog.so +lib/evolution/%%VERSION%%/libetimezonedialog.so.0 lib/evolution/%%VERSION%%/libeutil.a lib/evolution/%%VERSION%%/libeutil.so lib/evolution/%%VERSION%%/libeutil.so.0 @@ -270,12 +126,80 @@ lib/evolution/%%VERSION%%/libevolution-importer.so.0 lib/evolution/%%VERSION%%/libevolution-mail-importers.a lib/evolution/%%VERSION%%/libevolution-mail-importers.so lib/evolution/%%VERSION%%/libevolution-mail-importers.so.0 +lib/evolution/%%VERSION%%/libevolution-smime.a +lib/evolution/%%VERSION%%/libevolution-smime.so +lib/evolution/%%VERSION%%/libevolution-smime.so.0 lib/evolution/%%VERSION%%/libevolution-widgets-a11y.a lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so lib/evolution/%%VERSION%%/libevolution-widgets-a11y.so.0 +lib/evolution/%%VERSION%%/libfilter.a +lib/evolution/%%VERSION%%/libfilter.so +lib/evolution/%%VERSION%%/libfilter.so.0 +lib/evolution/%%VERSION%%/libmenus.a +lib/evolution/%%VERSION%%/libmenus.so +lib/evolution/%%VERSION%%/libmenus.so.0 +lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so +%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-compose-send-options.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-copy-tool.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-default-source.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-bbdb.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-evolution-startup-wizard.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-account-settings.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-gw-account-setup.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-itip-formatter.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-folder-unsubscribe.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so +%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-calendar.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-select-one-source.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-send-options.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-shared-folder.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so +lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so +lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug +%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-compose-send-options.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-copy-tool.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-default-source.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-bbdb.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-evolution-startup-wizard.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-account-setup.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-gw-account-setup.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-itip-formatter.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-mail-folder-unsubscribe.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug +%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-save-attachments.xml +lib/evolution/%%VERSION%%/plugins/org-gnome-save-calendar.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-select-one-source.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-send-options.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-shared-folder.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-status-track.eplug +lib/evolution/%%VERSION%%/plugins/org-gnome-subject-thread.eplug libdata/bonobo/servers/GNOME_Evolution_Addressbook_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_%%VERSION%%.server -libdata/bonobo/servers/GNOME_Evolution_Addressbook_SelectNames_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Calendar_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%%VERSION%%.server @@ -283,10 +207,8 @@ libdata/bonobo/servers/GNOME_Evolution_Calendar_Importer_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Mail_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Mail_Importers_%%VERSION%%.server libdata/bonobo/servers/GNOME_Evolution_Shell_%%VERSION%%.server -libdata/pkgconfig/camel-%%VERSION%%.pc +libdata/pkgconfig/evolution-plugin-%%VERSION%%.pc libdata/pkgconfig/evolution-shell-%%VERSION%%.pc -libexec/evolution/%%VERSION%%/camel/camel-index-control -libexec/evolution/%%VERSION%%/camel/camel-lock-helper libexec/evolution/%%VERSION%%/csv2vcard libexec/evolution/%%VERSION%%/evolution-addressbook-clean libexec/evolution/%%VERSION%%/evolution-addressbook-export @@ -296,6 +218,11 @@ share/gnome/applications/evolution-%%VERSION%%.desktop @exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/evolution/%%VERSION%%/addresstypes.xml share/gnome/evolution/%%VERSION%%/default/C/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/de/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/ja/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/nl/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/pt/mail/local/Inbox +share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local/Inbox share/gnome/evolution/%%VERSION%%/ecps/medbook.ecps share/gnome/evolution/%%VERSION%%/ecps/phonelist.ecps share/gnome/evolution/%%VERSION%%/ecps/smallbook.ecps @@ -303,6 +230,9 @@ share/gnome/evolution/%%VERSION%%/errors/addressbook-errors.xml share/gnome/evolution/%%VERSION%%/errors/calendar-errors.xml share/gnome/evolution/%%VERSION%%/errors/e-system-errors.xml share/gnome/evolution/%%VERSION%%/errors/filter-errors.xml +share/gnome/evolution/%%VERSION%%/errors/org-gnome-itip-formatter-errors.xml +share/gnome/evolution/%%VERSION%%/errors/org-gnome-mailing-list-actions-errors.xml +share/gnome/evolution/%%VERSION%%/errors/org-gnome-shared-folder-errors.xml share/gnome/evolution/%%VERSION%%/errors/mail-composer-errors.xml share/gnome/evolution/%%VERSION%%/errors/mail-errors.xml share/gnome/evolution/%%VERSION%%/errors/shell-errors.xml @@ -311,15 +241,13 @@ share/gnome/evolution/%%VERSION%%/etspec/e-cal-list-view.etspec share/gnome/evolution/%%VERSION%%/etspec/e-calendar-table.etspec share/gnome/evolution/%%VERSION%%/etspec/e-contact-list-editor.etspec share/gnome/evolution/%%VERSION%%/etspec/e-meeting-time-sel.etspec -share/gnome/evolution/%%VERSION%%/etspec/e-select-names-section.etspec -share/gnome/evolution/%%VERSION%%/etspec/e-select-names.etspec share/gnome/evolution/%%VERSION%%/etspec/message-list.etspec share/gnome/evolution/%%VERSION%%/filtertypes.xml share/gnome/evolution/%%VERSION%%/glade/alarm-dialog.glade share/gnome/evolution/%%VERSION%%/glade/alarm-list-dialog.glade share/gnome/evolution/%%VERSION%%/glade/alarm-notify.glade +share/gnome/evolution/%%VERSION%%/glade/cal-attachment.glade share/gnome/evolution/%%VERSION%%/glade/cal-prefs-dialog.glade -share/gnome/evolution/%%VERSION%%/glade/calendar-setup.glade share/gnome/evolution/%%VERSION%%/glade/contact-editor.glade share/gnome/evolution/%%VERSION%%/glade/contact-list-editor.glade share/gnome/evolution/%%VERSION%%/glade/e-active-connection-dialog.glade @@ -327,6 +255,7 @@ share/gnome/evolution/%%VERSION%%/glade/e-contact-print.glade share/gnome/evolution/%%VERSION%%/glade/e-delegate-dialog.glade share/gnome/evolution/%%VERSION%%/glade/e-itip-control.glade share/gnome/evolution/%%VERSION%%/glade/e-msg-composer-attachment.glade +share/gnome/evolution/%%VERSION%%/glade/e-send-options.glade share/gnome/evolution/%%VERSION%%/glade/e-timezone-dialog.glade share/gnome/evolution/%%VERSION%%/glade/eab-contact-commit-duplicate-detected.glade share/gnome/evolution/%%VERSION%%/glade/eab-contact-duplicate-detected.glade @@ -342,9 +271,9 @@ share/gnome/evolution/%%VERSION%%/glade/ldap-config.glade share/gnome/evolution/%%VERSION%%/glade/mail-config.glade share/gnome/evolution/%%VERSION%%/glade/mail-dialogs.glade share/gnome/evolution/%%VERSION%%/glade/meeting-page.glade +share/gnome/evolution/%%VERSION%%/glade/properties.glade share/gnome/evolution/%%VERSION%%/glade/recurrence-page.glade share/gnome/evolution/%%VERSION%%/glade/schedule-page.glade -share/gnome/evolution/%%VERSION%%/glade/select-names.glade share/gnome/evolution/%%VERSION%%/glade/smime-ui.glade share/gnome/evolution/%%VERSION%%/glade/task-details-page.glade share/gnome/evolution/%%VERSION%%/glade/task-page.glade @@ -360,11 +289,7 @@ share/gnome/evolution/%%VERSION%%/images/world_map-960.png share/gnome/evolution/%%VERSION%%/searchtypes.xml share/gnome/evolution/%%VERSION%%/ui/evolution-addressbook.xml share/gnome/evolution/%%VERSION%%/ui/evolution-calendar.xml -share/gnome/evolution/%%VERSION%%/ui/evolution-comp-editor.xml share/gnome/evolution/%%VERSION%%/ui/evolution-composer-entries.xml -share/gnome/evolution/%%VERSION%%/ui/evolution-contact-editor.xml -share/gnome/evolution/%%VERSION%%/ui/evolution-contact-list-editor.xml -share/gnome/evolution/%%VERSION%%/ui/evolution-event-editor.xml share/gnome/evolution/%%VERSION%%/ui/evolution-executive-summary.xml share/gnome/evolution/%%VERSION%%/ui/evolution-mail-global.xml share/gnome/evolution/%%VERSION%%/ui/evolution-mail-list.xml @@ -373,7 +298,6 @@ share/gnome/evolution/%%VERSION%%/ui/evolution-mail-messagedisplay.xml share/gnome/evolution/%%VERSION%%/ui/evolution-message-composer.xml share/gnome/evolution/%%VERSION%%/ui/evolution-signature-editor.xml share/gnome/evolution/%%VERSION%%/ui/evolution-subscribe.xml -share/gnome/evolution/%%VERSION%%/ui/evolution-task-editor.xml share/gnome/evolution/%%VERSION%%/ui/evolution-tasks.xml share/gnome/evolution/%%VERSION%%/ui/evolution.xml share/gnome/evolution/%%VERSION%%/vfoldertypes.xml @@ -394,6 +318,13 @@ share/gnome/evolution/%%VERSION%%/views/tasks/Tasks.galview share/gnome/evolution/%%VERSION%%/views/tasks/With_DueDate.galview share/gnome/evolution/%%VERSION%%/views/tasks/With_Status.galview share/gnome/evolution/%%VERSION%%/views/tasks/galview.xml +share/gnome/evolution/%%VERSION%%/weather/category_weather_cloudy_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_fog_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_partly_cloudy_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_rain_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_snow_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_sun_16.png +share/gnome/evolution/%%VERSION%%/weather/category_weather_tstorm_16.png %%PILOT:%%share/gnome/gnome-pilot/conduits/e-address-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-calendar-%%VERSION%%.conduit %%PILOT:%%share/gnome/gnome-pilot/conduits/e-todo-%%VERSION%%.conduit @@ -410,8 +341,8 @@ share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_email_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_gwreceive_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_identity_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_imapreceive_a.png -share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_maildirreceive_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mail_callout_a.png +share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_maildirreceive_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mboxreceive_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mereceive_a.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/evo_mhreceive_a.png @@ -445,7 +376,6 @@ share/gnome/help/evolution-%%PORTVERSION%%/C/figures/replymsg.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/schedule.png share/gnome/help/evolution-%%PORTVERSION%%/C/figures/vfolder-createrule-fig.png share/gnome/idl/evolution-%%VERSION%%/Composer.idl -share/gnome/idl/evolution-%%VERSION%%/Evolution-Addressbook-SelectNames.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Component.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-Composer.idl share/gnome/idl/evolution-%%VERSION%%/Evolution-ConfigControl.idl @@ -465,7 +395,6 @@ share/locale/ar/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/az/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/be/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/bn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/bs/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -486,18 +415,14 @@ share/locale/ga/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/he/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/hi/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/hr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/is/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/it/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lt/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/lv/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/mk/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/ml/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/mn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -516,7 +441,6 @@ share/locale/sq/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sr@Latn/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/sv/LC_MESSAGES/evolution-%%VERSION%%.mo -share/locale/ta/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/tr/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/uk/LC_MESSAGES/evolution-%%VERSION%%.mo share/locale/vi/LC_MESSAGES/evolution-%%VERSION%%.mo @@ -528,6 +452,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/help/evolution-%%PORTVERSION%%/C/figures @dirrm share/gnome/help/evolution-%%PORTVERSION%%/C @dirrm share/gnome/help/evolution-%%PORTVERSION%% +@dirrm share/gnome/evolution/%%VERSION%%/weather @dirrm share/gnome/evolution/%%VERSION%%/views/tasks @dirrm share/gnome/evolution/%%VERSION%%/views/mail @dirrm share/gnome/evolution/%%VERSION%%/views/calendar @@ -542,20 +467,34 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm share/gnome/evolution/%%VERSION%%/etspec @dirrm share/gnome/evolution/%%VERSION%%/errors @dirrm share/gnome/evolution/%%VERSION%%/ecps +@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/zh_CN +@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/pt/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/pt +@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/nl/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/nl +@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/ja/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/ja +@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail/local +@dirrm share/gnome/evolution/%%VERSION%%/default/de/mail +@dirrm share/gnome/evolution/%%VERSION%%/default/de @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail/local @dirrm share/gnome/evolution/%%VERSION%%/default/C/mail @dirrm share/gnome/evolution/%%VERSION%%/default/C @dirrm share/gnome/evolution/%%VERSION%%/default @dirrm share/gnome/evolution/%%VERSION%% @dirrm share/gnome/evolution -@dirrm libexec/evolution/%%VERSION%%/camel @dirrm libexec/evolution/%%VERSION%% @dirrm libexec/evolution +@dirrm lib/evolution/%%VERSION%%/plugins @dirrm lib/evolution/%%VERSION%%/evolution-calendar-importers @dirrm lib/evolution/%%VERSION%%/evolution-addressbook-importers %%PILOT:%%@dirrm lib/evolution/%%VERSION%%/conduits @dirrm lib/evolution/%%VERSION%%/components -@dirrm lib/evolution/%%VERSION%%/camel-providers @dirrm lib/evolution/%%VERSION%% @dirrm lib/evolution @dirrm include/evolution-%%VERSION%%/widgets @@ -563,6 +502,7 @@ share/locale/zh_TW/LC_MESSAGES/evolution-%%VERSION%%.mo @dirrm include/evolution-%%VERSION%%/importer @dirrm include/evolution-%%VERSION%%/e-util @dirrm include/evolution-%%VERSION%%/e-conduit -@dirrm include/evolution-%%VERSION%%/camel +@dirrm include/evolution-%%VERSION%%/calendar/gui +@dirrm include/evolution-%%VERSION%%/calendar @dirrm include/evolution-%%VERSION%% @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile index f8f815e4531a..90ba22ac5525 100644 --- a/mail/ximian-connector/Makefile +++ b/mail/ximian-connector/Makefile @@ -6,10 +6,10 @@ # PORTNAME= ximian -PORTVERSION= 2.0.4 +PORTVERSION= 2.2.0 CATEGORIES= mail gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.0 +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.2 PKGNAMESUFFIX= -connector DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} @@ -26,13 +26,13 @@ USE_GMAKE= yes USE_OPENLDAP= yes USE_GNOME= gnomeprefix intlhack gnomehack gnometarget CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -rpath ${X11BASE}/lib/evolution/${EVO_VERSION}" + LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ --with-static-ldap=no DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -EVO_VERSION= 2.0 -PLIST_SUB= VERSION="2.0" EVO_VERSION=${EVO_VERSION} +EVO_VERSION= 2.2 +PLIST_SUB= VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" .include <bsd.port.pre.mk> @@ -48,4 +48,8 @@ CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} .endif .endif +.if ${ARCH} == "amd64" +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" +.endif + .include <bsd.port.post.mk> diff --git a/mail/ximian-connector/distinfo b/mail/ximian-connector/distinfo index 0bca663c9c31..bf1166cc4bf2 100644 --- a/mail/ximian-connector/distinfo +++ b/mail/ximian-connector/distinfo @@ -1,2 +1,2 @@ -MD5 (ximian-connector-2.0.4.tar.bz2) = 726499c226b0932882dffe76869e9031 -SIZE (ximian-connector-2.0.4.tar.bz2) = 1202829 +MD5 (ximian-connector-2.2.0.tar.bz2) = 10ee14a8670c36c24f1d13021257c0ce +SIZE (ximian-connector-2.2.0.tar.bz2) = 1242512 diff --git a/mail/ximian-connector/files/patch-storage_e-folder-exchange.c b/mail/ximian-connector/files/patch-storage_e-folder-exchange.c new file mode 100644 index 000000000000..7436ca9fe8f6 --- /dev/null +++ b/mail/ximian-connector/files/patch-storage_e-folder-exchange.c @@ -0,0 +1,16 @@ +--- storage/e-folder-exchange.c.orig Tue Jan 25 21:31:32 2005 ++++ storage/e-folder-exchange.c Tue Jan 25 21:31:52 2005 +@@ -689,11 +689,12 @@ + void + e_folder_exchange_unsubscribe (EFolder *folder) + { ++ E2kContext *ctx; + g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder)); + + /* FIXME : This is a hack as of now. The free_folder in mail-stub + gets called when we are in offline and the context is NULL then. */ +- E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); ++ ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); + if (ctx) { + e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder), + E_FOLDER_EXCHANGE_URI (folder)); diff --git a/mail/ximian-connector/pkg-plist b/mail/ximian-connector/pkg-plist index ac4581fd4159..c43d25bf769c 100644 --- a/mail/ximian-connector/pkg-plist +++ b/mail/ximian-connector/pkg-plist @@ -1,45 +1,17 @@ bin/ximian-connector-setup-%%VERSION%% -lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.so -lib/evolution/%%EVO_VERSION%%/camel-providers/libcamelexchange.urls +lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so +lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -%%DOCSDIR%%/E2kContext.html -%%DOCSDIR%%/E2kGlobalCatalog.html -%%DOCSDIR%%/E2kSecurityDescriptor.html -%%DOCSDIR%%/E2kSid.html -%%DOCSDIR%%/E2kUserDialog.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/up.png -%%DOCSDIR%%/ximian-connector-e2k-action.html -%%DOCSDIR%%/ximian-connector-e2k-autoconfig.html -%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html -%%DOCSDIR%%/ximian-connector-e2k-freebusy.html -%%DOCSDIR%%/ximian-connector-e2k-http-utils.html -%%DOCSDIR%%/ximian-connector-e2k-properties.html -%%DOCSDIR%%/ximian-connector-e2k-restriction.html -%%DOCSDIR%%/ximian-connector-e2k-result.html -%%DOCSDIR%%/ximian-connector-e2k-rule-xml.html -%%DOCSDIR%%/ximian-connector-e2k-rule.html -%%DOCSDIR%%/ximian-connector-e2k-uri.html -%%DOCSDIR%%/ximian-connector-e2k-utils.html -%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html -%%DOCSDIR%%/ximian-connector-test-utils.html -%%DOCSDIR%%/ximian-connector-xntlm-des.html -%%DOCSDIR%%/ximian-connector-xntlm-md4.html -%%DOCSDIR%%/ximian-connector-xntlm.html -%%DOCSDIR%%/ximian-connector.devhelp share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade +share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png share/gnome/ximian-connector/%%VERSION%%/images/connector.png @@ -51,8 +23,6 @@ share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/cy/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo @@ -61,10 +31,12 @@ share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo +share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index cc22b7c50382..3f91b3ac5cee 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gcalctool -PORTVERSION= 4.4.22 +PORTVERSION= 5.5.41 PORTEPOCH= 2 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME} @@ -18,8 +18,8 @@ COMMENT= A GNOME 2 calculator tool based on the old calctool for OpenWindows USE_BZIP2= yes USE_BISON= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 USE_REINPLACE= yes diff --git a/math/gcalctool/distinfo b/math/gcalctool/distinfo index 717a8f480d48..208d9bbf151d 100644 --- a/math/gcalctool/distinfo +++ b/math/gcalctool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gcalctool-4.4.22.tar.bz2) = 2136e88e26f9f12a677e6a0dc798b835 -SIZE (gnome2/gcalctool-4.4.22.tar.bz2) = 918782 +MD5 (gnome2/gcalctool-5.5.41.tar.bz2) = d4eb2287fa4236fc5a5bf52a930f33f5 +SIZE (gnome2/gcalctool-5.5.41.tar.bz2) = 1043027 diff --git a/math/gcalctool/files/patch-gcalctool_functions.c b/math/gcalctool/files/patch-gcalctool_functions.c new file mode 100644 index 000000000000..ba3d6af38beb --- /dev/null +++ b/math/gcalctool/files/patch-gcalctool_functions.c @@ -0,0 +1,19 @@ +--- gcalctool/functions.c.orig Mon Feb 28 17:07:30 2005 ++++ gcalctool/functions.c Mon Feb 28 17:07:43 2005 +@@ -311,7 +311,6 @@ + void + trig_filter(char **func) + { +- assert(func); + + enum mode { + normal = 0, +@@ -322,6 +321,8 @@ + + int inverse; + int hyperbolic; ++ ++ assert(func); + + inverse = (v->inverse) ? inv : 0; + hyperbolic = (v->hyperbolic) ? hyp : 0; diff --git a/math/gcalctool/pkg-plist b/math/gcalctool/pkg-plist index 299563af0e42..c7543a7ed279 100644 --- a/math/gcalctool/pkg-plist +++ b/math/gcalctool/pkg-plist @@ -83,7 +83,6 @@ share/locale/ar/LC_MESSAGES/gcalctool.mo share/locale/az/LC_MESSAGES/gcalctool.mo share/locale/be/LC_MESSAGES/gcalctool.mo share/locale/bg/LC_MESSAGES/gcalctool.mo -share/locale/bn/LC_MESSAGES/gcalctool.mo share/locale/bs/LC_MESSAGES/gcalctool.mo share/locale/ca/LC_MESSAGES/gcalctool.mo share/locale/cs/LC_MESSAGES/gcalctool.mo @@ -93,7 +92,9 @@ share/locale/de/LC_MESSAGES/gcalctool.mo share/locale/el/LC_MESSAGES/gcalctool.mo share/locale/en_CA/LC_MESSAGES/gcalctool.mo share/locale/en_GB/LC_MESSAGES/gcalctool.mo +share/locale/en_US/LC_MESSAGES/gcalctool.mo share/locale/es/LC_MESSAGES/gcalctool.mo +share/locale/et/LC_MESSAGES/gcalctool.mo share/locale/eu/LC_MESSAGES/gcalctool.mo share/locale/fa/LC_MESSAGES/gcalctool.mo share/locale/fi/LC_MESSAGES/gcalctool.mo @@ -114,6 +115,7 @@ share/locale/ml/LC_MESSAGES/gcalctool.mo share/locale/mn/LC_MESSAGES/gcalctool.mo share/locale/ms/LC_MESSAGES/gcalctool.mo share/locale/nb/LC_MESSAGES/gcalctool.mo +share/locale/ne/LC_MESSAGES/gcalctool.mo share/locale/nl/LC_MESSAGES/gcalctool.mo share/locale/no/LC_MESSAGES/gcalctool.mo share/locale/or/LC_MESSAGES/gcalctool.mo @@ -136,6 +138,8 @@ share/locale/uk/LC_MESSAGES/gcalctool.mo share/locale/vi/LC_MESSAGES/gcalctool.mo share/locale/zh_CN/LC_MESSAGES/gcalctool.mo share/locale/zh_TW/LC_MESSAGES/gcalctool.mo +@unexec rmdir %D/share/locale/en_US/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/en_US 2> /dev/null || true @dirrm share/gnome/omf/gcalctool @dirrm share/gnome/help/gcalctool/zh_TW/figures @dirrm share/gnome/help/gcalctool/zh_TW diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile index 2b7ea00c3d57..009e8e24296b 100644 --- a/misc/gnome-icon-theme/Makefile +++ b/misc/gnome-icon-theme/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnome-icon-theme -PORTVERSION= 2.8.0 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo index 08f1ed1a395d..5061353f9c02 100644 --- a/misc/gnome-icon-theme/distinfo +++ b/misc/gnome-icon-theme/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-icon-theme-2.8.0.tar.bz2) = 7be016337c44c024fb22f7b94b689d7b -SIZE (gnome2/gnome-icon-theme-2.8.0.tar.bz2) = 2867812 +MD5 (gnome2/gnome-icon-theme-2.10.0.tar.bz2) = efe05291abed1a46a4d64f940c5291dc +SIZE (gnome2/gnome-icon-theme-2.10.0.tar.bz2) = 2903792 diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist index 7ec97f7df4aa..417753d09928 100644 --- a/misc/gnome-icon-theme/pkg-plist +++ b/misc/gnome-icon-theme/pkg-plist @@ -3,25 +3,41 @@ share/icons/gnome/12x12/emblems/emblem-symbolic-link.png share/icons/gnome/12x12/filesystems/gnome-fs-directory-accept.png share/icons/gnome/12x12/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/12x12/filesystems/gnome-fs-directory.png +share/icons/gnome/16x16/filesystems/gnome-fs-directory.png +share/icons/gnome/16x16/filesystems/gnome-fs-home.png +share/icons/gnome/16x16/filesystems/gnome-fs-locally-shared.png +share/icons/gnome/16x16/filesystems/gnome-fs-share-private.png +share/icons/gnome/16x16/filesystems/gnome-fs-share.png +share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png +share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png share/icons/gnome/16x16/devices/gnome-dev-cdrom.png share/icons/gnome/16x16/devices/gnome-dev-dvd.png share/icons/gnome/16x16/devices/gnome-dev-ethernet.png share/icons/gnome/16x16/devices/gnome-dev-floppy.png share/icons/gnome/16x16/devices/gnome-dev-harddisk.png +share/icons/gnome/16x16/devices/gnome-dev-harddisk-1394.png +share/icons/gnome/16x16/devices/gnome-dev-harddisk-usb.png share/icons/gnome/16x16/devices/gnome-dev-ipod.png share/icons/gnome/16x16/devices/gnome-dev-memory.png share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png share/icons/gnome/16x16/devices/gnome-dev-pci.png share/icons/gnome/16x16/devices/gnome-dev-printer.png share/icons/gnome/16x16/devices/gnome-dev-removable.png +share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png +share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png share/icons/gnome/16x16/devices/gnome-dev-wavelan-encrypted.png share/icons/gnome/16x16/devices/gnome-dev-wavelan.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png share/icons/gnome/16x16/filesystems/gnome-fs-client.png +share/icons/gnome/16x16/filesystems/gnome-fs-desktop.png +share/icons/gnome/16x16/filesystems/gnome-fs-ftp.png share/icons/gnome/16x16/filesystems/gnome-fs-network.png +share/icons/gnome/16x16/filesystems/gnome-fs-nfs.png share/icons/gnome/16x16/filesystems/gnome-fs-server.png +share/icons/gnome/16x16/filesystems/gnome-fs-smb.png +share/icons/gnome/16x16/filesystems/gnome-fs-ssh.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-excel.png share/icons/gnome/16x16/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png @@ -37,11 +53,16 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/192x192/devices/gnome-dev-cdrom.png share/icons/gnome/192x192/filesystems/gnome-fs-regular.icon share/icons/gnome/192x192/filesystems/gnome-fs-regular.png -share/icons/gnome/192x192/filesystems/gnome-fs-trash-empty.png -share/icons/gnome/192x192/filesystems/gnome-fs-trash-full.png share/icons/gnome/24x24/devices/gnome-dev-battery.png share/icons/gnome/24x24/devices/gnome-dev-cdrom-audio.png share/icons/gnome/24x24/devices/gnome-dev-cdrom.png +share/icons/gnome/24x24/devices/gnome-dev-disc-cdr.png +share/icons/gnome/24x24/devices/gnome-dev-disc-cdrw.png +share/icons/gnome/24x24/devices/gnome-dev-disc-dvdr-plus.png +share/icons/gnome/24x24/devices/gnome-dev-disc-dvdr.png +share/icons/gnome/24x24/devices/gnome-dev-disc-dvdram.png +share/icons/gnome/24x24/devices/gnome-dev-disc-dvdrom.png +share/icons/gnome/24x24/devices/gnome-dev-disc-dvdrw.png share/icons/gnome/24x24/devices/gnome-dev-dvd.png share/icons/gnome/24x24/devices/gnome-dev-ethernet.png share/icons/gnome/24x24/devices/gnome-dev-floppy.png @@ -66,19 +87,29 @@ share/icons/gnome/24x24/emblems/emblem-symbolic-link.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png share/icons/gnome/24x24/filesystems/gnome-fs-client.png +share/icons/gnome/24x24/filesystems/gnome-fs-desktop.png share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.icon share/icons/gnome/24x24/filesystems/gnome-fs-directory-accept.png share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.icon share/icons/gnome/24x24/filesystems/gnome-fs-directory-visiting.png share/icons/gnome/24x24/filesystems/gnome-fs-directory.icon share/icons/gnome/24x24/filesystems/gnome-fs-directory.png +share/icons/gnome/24x24/filesystems/gnome-fs-home.png +share/icons/gnome/24x24/filesystems/gnome-fs-locally-shared.png share/icons/gnome/24x24/filesystems/gnome-fs-network.png share/icons/gnome/24x24/filesystems/gnome-fs-server.png +share/icons/gnome/24x24/filesystems/gnome-fs-share-private.png +share/icons/gnome/24x24/filesystems/gnome-fs-share.png +share/icons/gnome/24x24/filesystems/gnome-fs-trash-empty.png +share/icons/gnome/24x24/filesystems/gnome-fs-trash-full.png share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png share/icons/gnome/32x32/devices/gnome-dev-ipod.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png share/icons/gnome/32x32/filesystems/gnome-fs-client.png +share/icons/gnome/32x32/filesystems/gnome-fs-desktop.png +share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png +share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png share/icons/gnome/32x32/filesystems/gnome-fs-network.png share/icons/gnome/32x32/filesystems/gnome-fs-server.png share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png @@ -102,6 +133,13 @@ share/icons/gnome/36x36/filesystems/gnome-fs-directory.png share/icons/gnome/48x48/devices/gnome-dev-battery.png share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png share/icons/gnome/48x48/devices/gnome-dev-cdrom.png +share/icons/gnome/48x48/devices/gnome-dev-disc-cdr.png +share/icons/gnome/48x48/devices/gnome-dev-disc-cdrw.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr-plus.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdr.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdram.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrom.png +share/icons/gnome/48x48/devices/gnome-dev-disc-dvdrw.png share/icons/gnome/48x48/devices/gnome-dev-dvd.png share/icons/gnome/48x48/devices/gnome-dev-floppy.png share/icons/gnome/48x48/devices/gnome-dev-harddisk-1394.png @@ -154,20 +192,18 @@ share/icons/gnome/48x48/emblems/emblem-danger.icon share/icons/gnome/48x48/emblems/emblem-danger.png share/icons/gnome/48x48/emblems/emblem-desktop.icon share/icons/gnome/48x48/emblems/emblem-desktop.png +share/icons/gnome/48x48/emblems/emblem-distinguished.icon +share/icons/gnome/48x48/emblems/emblem-distinguished.png share/icons/gnome/48x48/emblems/emblem-documents.icon share/icons/gnome/48x48/emblems/emblem-documents.png share/icons/gnome/48x48/emblems/emblem-draft.icon share/icons/gnome/48x48/emblems/emblem-draft.png -share/icons/gnome/48x48/emblems/emblem-favorite.icon -share/icons/gnome/48x48/emblems/emblem-favorite.png share/icons/gnome/48x48/emblems/emblem-generic.icon share/icons/gnome/48x48/emblems/emblem-generic.png share/icons/gnome/48x48/emblems/emblem-handshake.icon share/icons/gnome/48x48/emblems/emblem-handshake.png share/icons/gnome/48x48/emblems/emblem-important.icon share/icons/gnome/48x48/emblems/emblem-important.png -share/icons/gnome/48x48/emblems/emblem-mail.icon -share/icons/gnome/48x48/emblems/emblem-mail.png share/icons/gnome/48x48/emblems/emblem-marketing.icon share/icons/gnome/48x48/emblems/emblem-marketing.png share/icons/gnome/48x48/emblems/emblem-money.icon @@ -198,6 +234,8 @@ share/icons/gnome/48x48/emblems/emblem-presentation.icon share/icons/gnome/48x48/emblems/emblem-presentation.png share/icons/gnome/48x48/emblems/emblem-sales.icon share/icons/gnome/48x48/emblems/emblem-sales.png +share/icons/gnome/48x48/emblems/emblem-shared.icon +share/icons/gnome/48x48/emblems/emblem-shared.png share/icons/gnome/48x48/emblems/emblem-sound.icon share/icons/gnome/48x48/emblems/emblem-sound.png share/icons/gnome/48x48/emblems/emblem-special.icon @@ -261,8 +299,10 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.p share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.impress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.stardivision.writer.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.calc.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.draw.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.impress.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-wordperfect.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-abiword.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-applix-spreadsheet.png @@ -271,7 +311,10 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-archive.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-bittorrent.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bla.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blender.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blf.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-blv.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip-compressed-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-bzip.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-cd-image.png @@ -286,6 +329,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dc-rom.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-deb.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-desktop.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dia-diagram.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dv.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-dvi.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-e-theme.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-executable.png @@ -337,6 +381,7 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-stuffit.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tar.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-tex.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-trash.png +share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-x509-ca-cert.png share/icons/gnome/48x48/mimetypes/gnome-mime-application-zip.png share/icons/gnome/48x48/mimetypes/gnome-mime-application.png share/icons/gnome/48x48/mimetypes/gnome-mime-audio-ac3.png @@ -426,28 +471,30 @@ share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-share.png share/icons/gnome/48x48/mimetypes/gnome-mime-x-directory-smb-workgroup.png share/icons/gnome/48x48/mimetypes/gnome-mime-x-font-afm.png share/icons/gnome/48x48/mimetypes/gnome-package.png -share/icons/gnome/72x72/filesystems/gnome-fs-directory-accept.icon -share/icons/gnome/72x72/filesystems/gnome-fs-directory-accept.png -share/icons/gnome/72x72/filesystems/gnome-fs-directory-visiting.icon -share/icons/gnome/72x72/filesystems/gnome-fs-directory-visiting.png -share/icons/gnome/72x72/filesystems/gnome-fs-directory.icon -share/icons/gnome/72x72/filesystems/gnome-fs-directory.png share/icons/gnome/72x72/filesystems/gnome-fs-regular.icon share/icons/gnome/72x72/filesystems/gnome-fs-regular.png -share/icons/gnome/96x96/filesystems/gnome-fs-directory-accept.icon -share/icons/gnome/96x96/filesystems/gnome-fs-directory-accept.png -share/icons/gnome/96x96/filesystems/gnome-fs-directory-visiting.icon -share/icons/gnome/96x96/filesystems/gnome-fs-directory-visiting.png -share/icons/gnome/96x96/filesystems/gnome-fs-directory.icon -share/icons/gnome/96x96/filesystems/gnome-fs-directory.png share/icons/gnome/96x96/filesystems/gnome-fs-regular.icon share/icons/gnome/96x96/filesystems/gnome-fs-regular.png share/icons/gnome/index.theme +share/icons/gnome/scalable/emblems/emblem-favorite.icon +share/icons/gnome/scalable/emblems/emblem-favorite.svg +share/icons/gnome/scalable/emblems/emblem-mail.icon +share/icons/gnome/scalable/emblems/emblem-mail.svg +share/icons/gnome/scalable/filesystems/gnome-fs-directory-accept.svg +share/icons/gnome/scalable/filesystems/gnome-fs-directory-visiting.svg +share/icons/gnome/scalable/filesystems/gnome-fs-directory.svg +share/icons/gnome/scalable/filesystems/gnome-fs-home.svg +share/icons/gnome/scalable/filesystems/gnome-fs-trash-empty.svg +share/icons/gnome/scalable/filesystems/gnome-fs-trash-full.svg share/icons/hicolor/16x16/apps/blender.png share/icons/hicolor/16x16/apps/config-language.png share/icons/hicolor/16x16/apps/gnome-devel.png share/icons/hicolor/16x16/apps/gnome-globe.png +share/icons/hicolor/16x16/apps/gnome-help.png +share/icons/hicolor/16x16/apps/gnome-logout.png +share/icons/hicolor/16x16/apps/gnome-run.png share/icons/hicolor/16x16/apps/gnome-settings.png +share/icons/hicolor/16x16/apps/gnome-window-manager.png share/icons/hicolor/16x16/apps/im-aim.png share/icons/hicolor/16x16/apps/im-icq.png share/icons/hicolor/16x16/apps/im-jabber.png @@ -458,6 +505,7 @@ share/icons/hicolor/16x16/apps/im.png share/icons/hicolor/16x16/apps/panel-notification-area.png share/icons/hicolor/16x16/apps/panel-window-list.png share/icons/hicolor/16x16/apps/panel-window-menu.png +share/icons/hicolor/16x16/apps/text-editor.png share/icons/hicolor/16x16/stock/chart/stock_chart-autoformat.png share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-columns.png share/icons/hicolor/16x16/stock/chart/stock_chart-data-in-rows.png @@ -579,6 +627,7 @@ share/icons/hicolor/16x16/stock/document/stock_preview-four-pages.png share/icons/hicolor/16x16/stock/document/stock_preview-two-pages.png share/icons/hicolor/16x16/stock/document/stock_print-layout.png share/icons/hicolor/16x16/stock/document/stock_print-options.png +share/icons/hicolor/16x16/stock/document/stock_print-resolution.png share/icons/hicolor/16x16/stock/document/stock_script.png share/icons/hicolor/16x16/stock/document/stock_scripts.png share/icons/hicolor/16x16/stock/document/stock_task-assigned-to.png @@ -705,6 +754,7 @@ share/icons/hicolor/16x16/stock/generic/stock_home.png share/icons/hicolor/16x16/stock/generic/stock_id.png share/icons/hicolor/16x16/stock/generic/stock_keyring.png share/icons/hicolor/16x16/stock/generic/stock_landline-phone.png +share/icons/hicolor/16x16/stock/generic/stock_leave-fullscreen.png share/icons/hicolor/16x16/stock/generic/stock_mark.png share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png share/icons/hicolor/16x16/stock/generic/stock_new-appointment.png @@ -751,6 +801,8 @@ share/icons/hicolor/16x16/stock/generic/stock_view-details.png share/icons/hicolor/16x16/stock/generic/stock_weather-cloudy.png share/icons/hicolor/16x16/stock/generic/stock_weather-few-clouds.png share/icons/hicolor/16x16/stock/generic/stock_weather-fog.png +share/icons/hicolor/16x16/stock/generic/stock_weather-night-clear.png +share/icons/hicolor/16x16/stock/generic/stock_weather-night-few-clouds.png share/icons/hicolor/16x16/stock/generic/stock_weather-showers.png share/icons/hicolor/16x16/stock/generic/stock_weather-snow.png share/icons/hicolor/16x16/stock/generic/stock_weather-storm.png @@ -946,6 +998,11 @@ share/icons/hicolor/16x16/stock/media/stock_repeat.png share/icons/hicolor/16x16/stock/media/stock_shuffle.png share/icons/hicolor/16x16/stock/media/stock_smart-playlist.png share/icons/hicolor/16x16/stock/media/stock_volume.png +share/icons/hicolor/16x16/stock/media/stock_volume-0.png +share/icons/hicolor/16x16/stock/media/stock_volume-max.png +share/icons/hicolor/16x16/stock/media/stock_volume-med.png +share/icons/hicolor/16x16/stock/media/stock_volume-min.png +share/icons/hicolor/16x16/stock/media/stock_volume-mute.png share/icons/hicolor/16x16/stock/navigation/stock_bottom.png share/icons/hicolor/16x16/stock/navigation/stock_down-with-subpoints.png share/icons/hicolor/16x16/stock/navigation/stock_down.png @@ -1129,6 +1186,7 @@ share/icons/hicolor/16x16/stock/object/stock_insert_graphic.png share/icons/hicolor/16x16/stock/object/stock_insert_special_character.png share/icons/hicolor/16x16/stock/object/stock_interaction.png share/icons/hicolor/16x16/stock/object/stock_new-bcard.png +share/icons/hicolor/16x16/stock/object/stock_new-window.png share/icons/hicolor/16x16/stock/object/stock_object-behind.png share/icons/hicolor/16x16/stock/object/stock_object-infront.png share/icons/hicolor/16x16/stock/object/stock_pin.png @@ -1327,16 +1385,21 @@ share/icons/hicolor/24x24/apps/gnome-devel.png share/icons/hicolor/24x24/apps/gnome-favorites.png share/icons/hicolor/24x24/apps/gnome-globe.png share/icons/hicolor/24x24/apps/gnome-graphics.png +share/icons/hicolor/24x24/apps/gnome-help.png share/icons/hicolor/24x24/apps/gnome-joystick.png share/icons/hicolor/24x24/apps/gnome-lockscreen.png +share/icons/hicolor/24x24/apps/gnome-logout.png share/icons/hicolor/24x24/apps/gnome-multimedia.png +share/icons/hicolor/24x24/apps/gnome-run.png share/icons/hicolor/24x24/apps/gnome-searchtool.png share/icons/hicolor/24x24/apps/gnome-settings.png share/icons/hicolor/24x24/apps/gnome-status.png share/icons/hicolor/24x24/apps/gnome-terminal.png +share/icons/hicolor/24x24/apps/gnome-window-manager.png share/icons/hicolor/24x24/apps/panel-notification-area.png share/icons/hicolor/24x24/apps/panel-window-list.png share/icons/hicolor/24x24/apps/panel-window-menu.png +share/icons/hicolor/24x24/apps/text-editor.png share/icons/hicolor/24x24/stock/chart/stock_chart-autoformat.png share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-columns.png share/icons/hicolor/24x24/stock/chart/stock_chart-data-in-rows.png @@ -1435,6 +1498,7 @@ share/icons/hicolor/24x24/stock/document/stock_preview-four-pages.png share/icons/hicolor/24x24/stock/document/stock_preview-two-pages.png share/icons/hicolor/24x24/stock/document/stock_print-layout.png share/icons/hicolor/24x24/stock/document/stock_print-options.png +share/icons/hicolor/24x24/stock/document/stock_print-resolution.png share/icons/hicolor/24x24/stock/document/stock_task-assigned-to.png share/icons/hicolor/24x24/stock/document/stock_task-assigned.png share/icons/hicolor/24x24/stock/document/stock_task-recurring.png @@ -1530,6 +1594,7 @@ share/icons/hicolor/24x24/stock/generic/stock_home.png share/icons/hicolor/24x24/stock/generic/stock_id.png share/icons/hicolor/24x24/stock/generic/stock_keyring.png share/icons/hicolor/24x24/stock/generic/stock_landline-phone.png +share/icons/hicolor/24x24/stock/generic/stock_leave-fullscreen.png share/icons/hicolor/24x24/stock/generic/stock_mark.png share/icons/hicolor/24x24/stock/generic/stock_new-24h-appointment.png share/icons/hicolor/24x24/stock/generic/stock_new-appointment.png @@ -1740,6 +1805,11 @@ share/icons/hicolor/24x24/stock/media/stock_playlist.png share/icons/hicolor/24x24/stock/media/stock_repeat.png share/icons/hicolor/24x24/stock/media/stock_smart-playlist.png share/icons/hicolor/24x24/stock/media/stock_volume.png +share/icons/hicolor/24x24/stock/media/stock_volume-0.png +share/icons/hicolor/24x24/stock/media/stock_volume-max.png +share/icons/hicolor/24x24/stock/media/stock_volume-med.png +share/icons/hicolor/24x24/stock/media/stock_volume-min.png +share/icons/hicolor/24x24/stock/media/stock_volume-mute.png share/icons/hicolor/24x24/stock/navigation/stock_bottom.png share/icons/hicolor/24x24/stock/navigation/stock_down-with-subpoints.png share/icons/hicolor/24x24/stock/navigation/stock_down.png @@ -1859,6 +1929,7 @@ share/icons/hicolor/24x24/stock/object/stock_insert_graphic.png share/icons/hicolor/24x24/stock/object/stock_insert_special_character.png share/icons/hicolor/24x24/stock/object/stock_interaction.png share/icons/hicolor/24x24/stock/object/stock_new-bcard.png +share/icons/hicolor/24x24/stock/object/stock_new-window.png share/icons/hicolor/24x24/stock/object/stock_object-behind.png share/icons/hicolor/24x24/stock/object/stock_object-infront.png share/icons/hicolor/24x24/stock/object/stock_pin.png @@ -2058,6 +2129,7 @@ share/icons/hicolor/32x32/apps/gnome-nibbles.png share/icons/hicolor/32x32/apps/gnome-pdf.png share/icons/hicolor/32x32/apps/gnome-terminal.png share/icons/hicolor/32x32/apps/gnome-util.png +share/icons/hicolor/32x32/apps/gnome-window-manager.png share/icons/hicolor/32x32/apps/hwbrowser.png share/icons/hicolor/32x32/apps/iagno.png share/icons/hicolor/32x32/apps/keyboard.png @@ -2069,6 +2141,7 @@ share/icons/hicolor/32x32/apps/panel-window-menu.png share/icons/hicolor/32x32/apps/postscript-viewer.png share/icons/hicolor/32x32/apps/serviceconf.png share/icons/hicolor/32x32/apps/system-floppy.png +share/icons/hicolor/32x32/apps/text-editor.png share/icons/hicolor/32x32/apps/tsclient.png share/icons/hicolor/32x32/apps/web-browser.png share/icons/hicolor/32x32/apps/xcdroast.png @@ -2177,13 +2250,18 @@ share/icons/hicolor/48x48/apps/apacheconf.png share/icons/hicolor/48x48/apps/applets-screenshooter.png share/icons/hicolor/48x48/apps/beast.png share/icons/hicolor/48x48/apps/blender.png +share/icons/hicolor/48x48/apps/burner.png +share/icons/hicolor/48x48/apps/character-picker.png +share/icons/hicolor/48x48/apps/clock.png share/icons/hicolor/48x48/apps/config-date.png share/icons/hicolor/48x48/apps/config-language.png share/icons/hicolor/48x48/apps/config-users.png share/icons/hicolor/48x48/apps/config-xfree.png share/icons/hicolor/48x48/apps/dia_gnome_icon.png share/icons/hicolor/48x48/apps/disks.png +share/icons/hicolor/48x48/apps/drawer.png share/icons/hicolor/48x48/apps/evolution.png +share/icons/hicolor/48x48/apps/eyes.png share/icons/hicolor/48x48/apps/file-manager.png share/icons/hicolor/48x48/apps/file-roller.png share/icons/hicolor/48x48/apps/gdict.png @@ -2216,6 +2294,7 @@ share/icons/hicolor/48x48/apps/gnome-other.png share/icons/hicolor/48x48/apps/gnome-panel.png share/icons/hicolor/48x48/apps/gnome-pdf.png share/icons/hicolor/48x48/apps/gnome-reboot.png +share/icons/hicolor/48x48/apps/gnome-run.png share/icons/hicolor/48x48/apps/gnome-searchtool-animation-rest.png share/icons/hicolor/48x48/apps/gnome-searchtool-animation.png share/icons/hicolor/48x48/apps/gnome-searchtool.png @@ -2250,8 +2329,11 @@ share/icons/hicolor/48x48/apps/im-nov.png share/icons/hicolor/48x48/apps/im-yahoo.png share/icons/hicolor/48x48/apps/im.png share/icons/hicolor/48x48/apps/keyboard.png +share/icons/hicolor/48x48/apps/launcher-program.png share/icons/hicolor/48x48/apps/logviewer.png +share/icons/hicolor/48x48/apps/modem.png share/icons/hicolor/48x48/apps/network-config.png +share/icons/hicolor/48x48/apps/palm-pilot-sync.png share/icons/hicolor/48x48/apps/palm-pilot.png share/icons/hicolor/48x48/apps/panel-notification-area.png share/icons/hicolor/48x48/apps/panel-window-list.png @@ -2261,13 +2343,15 @@ share/icons/hicolor/48x48/apps/realplayer.png share/icons/hicolor/48x48/apps/screensaver.png share/icons/hicolor/48x48/apps/serviceconf.png share/icons/hicolor/48x48/apps/sodipodi.png +share/icons/hicolor/48x48/apps/stock-ticker.png +share/icons/hicolor/48x48/apps/text-editor.png share/icons/hicolor/48x48/apps/tsclient.png share/icons/hicolor/48x48/apps/user-info.png share/icons/hicolor/48x48/apps/visor.png +share/icons/hicolor/48x48/apps/volume-knob.png share/icons/hicolor/48x48/apps/wallpaper.png share/icons/hicolor/48x48/apps/web-browser.png share/icons/hicolor/48x48/apps/wine.png -share/icons/hicolor/48x48/apps/xcdroast.png share/icons/hicolor/48x48/apps/xchat.png share/icons/hicolor/48x48/apps/xsane.png share/icons/hicolor/48x48/stock/code/stock_script.png @@ -2321,6 +2405,8 @@ share/icons/hicolor/48x48/stock/generic/stock_unknown.png share/icons/hicolor/48x48/stock/generic/stock_weather-cloudy.png share/icons/hicolor/48x48/stock/generic/stock_weather-few-clouds.png share/icons/hicolor/48x48/stock/generic/stock_weather-fog.png +share/icons/hicolor/48x48/stock/generic/stock_weather-night-clear.png +share/icons/hicolor/48x48/stock/generic/stock_weather-night-few-clouds.png share/icons/hicolor/48x48/stock/generic/stock_weather-showers.png share/icons/hicolor/48x48/stock/generic/stock_weather-snow.png share/icons/hicolor/48x48/stock/generic/stock_weather-storm.png @@ -2355,6 +2441,7 @@ share/icons/hicolor/48x48/stock/net/stock_mail-flag-for-followup.png share/icons/hicolor/48x48/stock/net/stock_mail-import.png share/icons/hicolor/48x48/stock/net/stock_mail-open.png share/icons/hicolor/48x48/stock/net/stock_mail-receive.png +share/icons/hicolor/48x48/stock/net/stock_mail-replied.png share/icons/hicolor/48x48/stock/net/stock_mail-send-receive.png share/icons/hicolor/48x48/stock/net/stock_mail-send.png share/icons/hicolor/48x48/stock/net/stock_mail.png @@ -2367,79 +2454,90 @@ share/icons/hicolor/48x48/stock/net/stock_spam.png share/icons/hicolor/72x72/apps/gnome-globe.png share/icons/hicolor/96x96/apps/gnome-globe.png share/icons/hicolor/96x96/apps/gnome-starthere.png -@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/document 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/generic 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/document 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/generic 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/document 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/text 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/table 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/object 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/net 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/navigation 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/media 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/io 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/image 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/generic 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/form 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/document 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/data 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/code 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/chart 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24/apps 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/24x24 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/generic 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/emoticons 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/document 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/scalable/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/scalable/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/scalable/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/scalable/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/scalable 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/96x96/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/96x96/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/96x96/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/96x96/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/96x96 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/72x72/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/72x72/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/72x72/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/72x72/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/72x72 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48/apps 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/48x48 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/36x36/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/36x36/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/36x36/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/36x36/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/36x36 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/32x32/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/32x32/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/32x32/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/32x32 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/24x24/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/24x24/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/24x24/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/24x24/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/24x24 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/192x192/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/192x192/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/192x192/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/192x192/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/192x192 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/16x16/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/16x16/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/16x16/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/16x16 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/12x12/mimetypes 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/12x12/filesystems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/12x12/emblems 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/12x12/devices 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome/12x12 2> /dev/null || /usr/bin/true -@unexec /bin/rmdir %D/share/icons/gnome 2> /dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/96x96 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/72x72 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/document 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/generic 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock/document 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/36x36/stock 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/36x36 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/generic 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/32x32/stock/document 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/32x32 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/text 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/table 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/object 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/net 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/navigation 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/media 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/io 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/image 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/generic 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/form 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/document 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/data 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/code 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock/chart 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/stock 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/24x24 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/192x192 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/generic 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/emoticons 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/16x16/stock/document 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/16x16 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/scalable 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/96x96/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/96x96/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/96x96/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/96x96/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/96x96 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/72x72/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/72x72/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/72x72/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/72x72/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/72x72 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/36x36/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/36x36/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/36x36/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/36x36/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/36x36 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/32x32 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/24x24 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/192x192/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/192x192/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/192x192/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/192x192/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/192x192 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/16x16 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/12x12/mimetypes 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/12x12/filesystems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/12x12/emblems 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/12x12/devices 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome/12x12 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/gnome 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile index f366ae2f6107..8f8b4ab0fda5 100644 --- a/misc/gnomehier/Makefile +++ b/misc/gnomehier/Makefile @@ -6,8 +6,8 @@ # PORTNAME= gnomehier -PORTVERSION= 1.0 -PORTREVISION= 22 +PORTVERSION= 2.0 +PORTREVISION= 3 CATEGORIES= misc gnome MASTER_SITES= # none DISTFILES= # none @@ -16,29 +16,47 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A utility port that creates the GNOME directory tree NO_BUILD= yes -NO_WRKSUBDIR= yes PLIST?= ${WRKDIR}/pkg-plist +PKGINSTALL= ${WRKDIR}/pkg-install + +GNOME_MTREE= BSD.gnome-x11.dist USE_X_PREFIX= yes +GNOME_MTREE_ARGS=${MTREE_ARGS:S|${MTREE_FILE}|${PREFIX}/etc/mtree/${GNOME_MTREE}|} + do-fetch: @${DO_NADA} pre-install: - @${RM} -f ${PLIST} + @${CP} -f ${FILESDIR}/dirlist ${WRKDIR} + @${RM} -f ${PLIST} ${WRKDIR}/${GNOME_MTREE} @${TOUCH} -f ${PLIST} - @${CAT} ${FILESDIR}/dirlist | ${SORT} | ${SED} -e \ - 's|$$|/.keep_me|' >> ${PLIST} + @${ECHO_CMD} etc/mtree/${GNOME_MTREE} >> ${PLIST} + @${MKDIR} ${WRKSRC} @${CAT} ${FILESDIR}/dirlist | ${SORT} -r | ${SED} -e \ 's|^|@dirrm |' >> ${PLIST} - -do-install: - @for dir in `${CAT} ${FILESDIR}/dirlist`; \ + @${ECHO_CMD} "@unexec ${RMDIR} %D/etc/mtree 2>/dev/null || ${TRUE}" >> ${PLIST} + @for dir in `${CAT} ${WRKDIR}/dirlist`; \ do \ - ${MKDIR} ${PREFIX}/$${dir}; \ - ${TOUCH} ${PREFIX}/$${dir}/.keep_me; \ + ${MKDIR} ${WRKSRC}/$${dir}; \ done - ${CHGRP} games ${PREFIX}/share/gnome/games - ${CHMOD} g=rwXs ${PREFIX}/share/gnome/games + @${SED} -e 's|%%MTREE_ARGS%%|${GNOME_MTREE_ARGS}|' \ + < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} + +pre-su-install: + ${CHGRP} games ${WRKSRC}/share/gnome/games + ${CHMOD} g=rwXs ${WRKSRC}/share/gnome/games + ${MTREE_CMD} ${MTREE_ARGS} ${WRKSRC}/ + cd ${WRKSRC} && \ + ${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" \ + > ${WRKDIR}/${GNOME_MTREE} + +do-install: + ${MKDIR} ${PREFIX}/etc/mtree + ${INSTALL_DATA} ${WRKDIR}/${GNOME_MTREE} ${PREFIX}/etc/mtree + +post-install: + @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/misc/gnomehier/files/pkg-install.in b/misc/gnomehier/files/pkg-install.in new file mode 100644 index 000000000000..20e30328e7c2 --- /dev/null +++ b/misc/gnomehier/files/pkg-install.in @@ -0,0 +1,8 @@ +#!/bin/sh + +case $2 in +POST-INSTALL) + /usr/sbin/mtree %%MTREE_ARGS%% ${PKG_PREFIX} + exit 0 + ;; +esac diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile deleted file mode 100644 index b7d4b296bafa..000000000000 --- a/multimedia/nautilus-media/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# New ports collection makefile for: nautilus-media -# Date created: 30 November 2002 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= nautilus-media -PORTVERSION= 0.8.1 -PORTREVISION= 1 -CATEGORIES= multimedia gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8 -DIST_SUBDIR= gnome2 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= GStreamer-based multimedia views for Nautilus - -USE_BZIP2= yes -USE_X_PREFIX= yes -USE_GMAKE= yes -GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack intlhack lthack nautilus2 -USE_GSTREAMER= core gnomevfs -USE_INC_LIBTOOL_VER=13 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -GCONF_SCHEMAS= gst-thumbnail.schemas - -.include <bsd.port.mk> diff --git a/multimedia/nautilus-media/distinfo b/multimedia/nautilus-media/distinfo deleted file mode 100644 index dc6fb6216567..000000000000 --- a/multimedia/nautilus-media/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (gnome2/nautilus-media-0.8.1.tar.bz2) = 4ad604430b213a899c1217f5f4633887 -SIZE (gnome2/nautilus-media-0.8.1.tar.bz2) = 418924 diff --git a/multimedia/nautilus-media/pkg-descr b/multimedia/nautilus-media/pkg-descr deleted file mode 100644 index c8ad32667488..000000000000 --- a/multimedia/nautilus-media/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Nautilus-media provides GStreamer-based multimedia support within -Nautilus, including music previewing and video thumbnailing. diff --git a/multimedia/nautilus-media/pkg-plist b/multimedia/nautilus-media/pkg-plist deleted file mode 100644 index b60c1c45bc03..000000000000 --- a/multimedia/nautilus-media/pkg-plist +++ /dev/null @@ -1,79 +0,0 @@ -bin/gst-thumbnail -lib/bonobo/libnautilus-audio-properties-view.so -libdata/bonobo/servers/Nautilus_View_audio.server -libdata/bonobo/servers/Nautilus_View_audio_properties.server -libexec/nautilus-audio-view -share/gnome/gnome-2.0/ui/nautilus-audio-view-ui.xml -share/gnome/nautilus/glade/audio-properties-view.glade -share/gnome/pixmaps/nautilus-media/next.png -share/gnome/pixmaps/nautilus-media/pause.png -share/gnome/pixmaps/nautilus-media/play.png -share/gnome/pixmaps/nautilus-media/prev.png -share/gnome/pixmaps/nautilus-media/scan.png -share/gnome/pixmaps/nautilus-media/stop.png -share/locale/am/LC_MESSAGES/nautilus-media.mo -share/locale/ar/LC_MESSAGES/nautilus-media.mo -share/locale/az/LC_MESSAGES/nautilus-media.mo -share/locale/be/LC_MESSAGES/nautilus-media.mo -share/locale/bg/LC_MESSAGES/nautilus-media.mo -share/locale/bn/LC_MESSAGES/nautilus-media.mo -share/locale/bs/LC_MESSAGES/nautilus-media.mo -share/locale/ca/LC_MESSAGES/nautilus-media.mo -share/locale/cs/LC_MESSAGES/nautilus-media.mo -share/locale/cy/LC_MESSAGES/nautilus-media.mo -share/locale/da/LC_MESSAGES/nautilus-media.mo -share/locale/de/LC_MESSAGES/nautilus-media.mo -share/locale/el/LC_MESSAGES/nautilus-media.mo -share/locale/en_GB/LC_MESSAGES/nautilus-media.mo -share/locale/en_CA/LC_MESSAGES/nautilus-media.mo -share/locale/es/LC_MESSAGES/nautilus-media.mo -share/locale/et/LC_MESSAGES/nautilus-media.mo -share/locale/eu/LC_MESSAGES/nautilus-media.mo -share/locale/fa/LC_MESSAGES/nautilus-media.mo -share/locale/fi/LC_MESSAGES/nautilus-media.mo -share/locale/fr/LC_MESSAGES/nautilus-media.mo -share/locale/ga/LC_MESSAGES/nautilus-media.mo -share/locale/gu/LC_MESSAGES/nautilus-media.mo -share/locale/he/LC_MESSAGES/nautilus-media.mo -share/locale/hi/LC_MESSAGES/nautilus-media.mo -share/locale/hr/LC_MESSAGES/nautilus-media.mo -share/locale/hu/LC_MESSAGES/nautilus-media.mo -share/locale/id/LC_MESSAGES/nautilus-media.mo -share/locale/is/LC_MESSAGES/nautilus-media.mo -share/locale/it/LC_MESSAGES/nautilus-media.mo -share/locale/ja/LC_MESSAGES/nautilus-media.mo -share/locale/ko/LC_MESSAGES/nautilus-media.mo -share/locale/li/LC_MESSAGES/nautilus-media.mo -share/locale/lt/LC_MESSAGES/nautilus-media.mo -share/locale/lv/LC_MESSAGES/nautilus-media.mo -share/locale/mi/LC_MESSAGES/nautilus-media.mo -share/locale/mk/LC_MESSAGES/nautilus-media.mo -share/locale/ml/LC_MESSAGES/nautilus-media.mo -share/locale/mn/LC_MESSAGES/nautilus-media.mo -share/locale/ms/LC_MESSAGES/nautilus-media.mo -share/locale/nb/LC_MESSAGES/nautilus-media.mo -share/locale/nl/LC_MESSAGES/nautilus-media.mo -share/locale/nn/LC_MESSAGES/nautilus-media.mo -share/locale/no/LC_MESSAGES/nautilus-media.mo -share/locale/or/LC_MESSAGES/nautilus-media.mo -share/locale/pa/LC_MESSAGES/nautilus-media.mo -share/locale/pl/LC_MESSAGES/nautilus-media.mo -share/locale/pt/LC_MESSAGES/nautilus-media.mo -share/locale/pt_BR/LC_MESSAGES/nautilus-media.mo -share/locale/ro/LC_MESSAGES/nautilus-media.mo -share/locale/ru/LC_MESSAGES/nautilus-media.mo -share/locale/sk/LC_MESSAGES/nautilus-media.mo -share/locale/sl/LC_MESSAGES/nautilus-media.mo -share/locale/sq/LC_MESSAGES/nautilus-media.mo -share/locale/sr/LC_MESSAGES/nautilus-media.mo -share/locale/sr@Latn/LC_MESSAGES/nautilus-media.mo -share/locale/sv/LC_MESSAGES/nautilus-media.mo -share/locale/ta/LC_MESSAGES/nautilus-media.mo -share/locale/th/LC_MESSAGES/nautilus-media.mo -share/locale/tk/LC_MESSAGES/nautilus-media.mo -share/locale/tr/LC_MESSAGES/nautilus-media.mo -share/locale/uk/LC_MESSAGES/nautilus-media.mo -share/locale/vi/LC_MESSAGES/nautilus-media.mo -share/locale/zh_CN/LC_MESSAGES/nautilus-media.mo -share/locale/zh_TW/LC_MESSAGES/nautilus-media.mo -@dirrm share/gnome/pixmaps/nautilus-media diff --git a/multimedia/totem-gstreamer/Makefile b/multimedia/totem-gstreamer/Makefile index 56c5550d13e2..28bda1cea398 100644 --- a/multimedia/totem-gstreamer/Makefile +++ b/multimedia/totem-gstreamer/Makefile @@ -5,6 +5,7 @@ # $FreeBSD$ # +PORTREVISION= 1 PKGNAMESUFFIX= -gstreamer MAINTAINER= gnome@FreeBSD.org @@ -13,8 +14,8 @@ COMMENT= A Gstreamer-based video player for the Gnome 2 desktop MASTERDIR= ${.CURDIR}/../totem OPTIONS= - WITH_GSTREAMER= yes + CONFLICTS= totem-[0-9]* .include "${MASTERDIR}/Makefile" diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 5a7918826527..b1319f22e63c 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -6,8 +6,7 @@ # PORTNAME= totem -PORTVERSION= 0.100 -PORTREVISION= 1 +PORTVERSION= 1.0 CATEGORIES= multimedia gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION} @@ -16,18 +15,18 @@ DIST_SUBDIR= gnome2 MAINTAINER?= hendrik@scholz.net COMMENT?= A Xine-based video player for the Gnome 2 Desktop -LIB_DEPENDS= nautilus-burn.0:${PORTSDIR}/sysutils/nautilus-cd-burner - USE_REINPLACE= yes USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils +USE_GNOME= gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils \ + nautiluscdburner WANT_GSTREAMER= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr" +CONFIGURE_ARGS+=--disable-mozilla OPTIONS?= DVDNAV "Enable DVD support" on \ GSTREAMER "Use Gstreamer instead of Xine" off @@ -41,7 +40,7 @@ CONFLICTS= totem-gstreamer-[0-9]* .if defined(WITH_GSTREAMER) CONFIGURE_ARGS+=--enable-gstreamer -USE_GSTREAMER= gnomevfs core +USE_GSTREAMER+= gnomevfs core WITHOUT_DVDNAV= yes PLIST_SUB= GSTREAMER="" .else @@ -91,4 +90,7 @@ post-patch: ${WRKSRC}/src/bacon-video-widget-gst.c .endif +post-install: + @-update-desktop-database + .include <bsd.port.post.mk> diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index a2e694925bf5..dbe8c55a9a30 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/totem-0.100.tar.bz2) = 885423cc7e1d5eb8ff62b7b8ec9c30bc -SIZE (gnome2/totem-0.100.tar.bz2) = 1279913 +MD5 (gnome2/totem-1.0.tar.bz2) = eddfebd11ccb58caca72edc6485ed22f +SIZE (gnome2/totem-1.0.tar.bz2) = 1402642 diff --git a/multimedia/totem/files/patch-data_Makefile.in b/multimedia/totem/files/patch-data_Makefile.in deleted file mode 100644 index ac127a4ab657..000000000000 --- a/multimedia/totem/files/patch-data_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- data/Makefile.in.orig Sun Jan 9 21:15:28 2005 -+++ data/Makefile.in Sun Jan 9 21:16:01 2005 -@@ -167,8 +167,8 @@ - - desktop_in_in_files_all = totem.desktop.in.in.in vanity.desktop.in.in - desktop_in_files_all = totem.desktop.in.in vanity.desktop.in --@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in.in vanity.desktop.in --@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in.in -+@TOTEM_VANITY_TRUE@desktop_in_files = @TOTEM_VANITY_TRUE@totem.desktop.in vanity.desktop.in -+@TOTEM_VANITY_FALSE@desktop_in_files = @TOTEM_VANITY_FALSE@totem.desktop.in - - desktopdir = $(datadir)/applications/ - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist index e2e6502bdf7e..3d9d848dc419 100644 --- a/multimedia/totem/pkg-plist +++ b/multimedia/totem/pkg-plist @@ -1,8 +1,14 @@ bin/totem bin/totem-video-thumbnailer -libdata/bonobo/servers/Totem_properties.server -libexec/totem-properties-page -share/gnome/application-registry/totem.applications +include/totem/1/plparser/totem-disc.h +include/totem/1/plparser/totem-pl-parser-builtins.h +include/totem/1/plparser/totem-pl-parser.h +lib/libtotem-plparser.a +lib/libtotem-plparser.so +lib/libtotem-plparser.so.0 +lib/nautilus/extensions-1.0/libtotem-properties-page.a +lib/nautilus/extensions-1.0/libtotem-properties-page.so +libdata/pkgconfig/totem-plparser.pc share/gnome/applications/totem.desktop share/gnome/help/totem/C/figures/totem_next_button.png share/gnome/help/totem/C/figures/totem_pause_button.png @@ -34,11 +40,10 @@ share/gnome/help/totem/es/figures/totem_volume_maximum_button.png share/gnome/help/totem/es/figures/totem_volume_mute_button.png share/gnome/help/totem/es/legal.xml share/gnome/help/totem/es/totem.xml +share/gnome/help/totem/ru/figures/totem_screenshot.png +share/gnome/help/totem/ru/figures/totem_start_window.png share/gnome/help/totem/ru/legal.xml share/gnome/help/totem/ru/totem.xml -share/gnome/help/totem/ru/figures/totem_start_window.png -share/gnome/help/totem/ru/figures/totem_screenshot.png -share/gnome/mime-info/totem.keys share/gnome/omf/totem/totem-C.omf share/gnome/omf/totem/totem-de.omf share/gnome/omf/totem/totem-es.omf @@ -54,6 +59,7 @@ share/gnome/totem/playlist-16.png share/gnome/totem/playlist-24.png share/gnome/totem/playlist-playing.png share/gnome/totem/playlist.glade +share/gnome/totem/popup.glade share/gnome/totem/properties.glade share/gnome/totem/rhythmbox-volume-max.png share/gnome/totem/rhythmbox-volume-zero.png @@ -91,6 +97,7 @@ share/locale/fr/LC_MESSAGES/totem.mo share/locale/ga/LC_MESSAGES/totem.mo share/locale/gu/LC_MESSAGES/totem.mo share/locale/he/LC_MESSAGES/totem.mo +share/locale/hi/LC_MESSAGES/totem.mo share/locale/hr/LC_MESSAGES/totem.mo share/locale/hu/LC_MESSAGES/totem.mo share/locale/id/LC_MESSAGES/totem.mo @@ -106,6 +113,7 @@ share/locale/ms/LC_MESSAGES/totem.mo share/locale/nb/LC_MESSAGES/totem.mo share/locale/nl/LC_MESSAGES/totem.mo share/locale/no/LC_MESSAGES/totem.mo +share/locale/pa/LC_MESSAGES/totem.mo share/locale/pl/LC_MESSAGES/totem.mo share/locale/pt/LC_MESSAGES/totem.mo share/locale/pt_BR/LC_MESSAGES/totem.mo @@ -116,6 +124,7 @@ share/locale/sq/LC_MESSAGES/totem.mo share/locale/sr/LC_MESSAGES/totem.mo share/locale/sr@Latn/LC_MESSAGES/totem.mo share/locale/sv/LC_MESSAGES/totem.mo +share/locale/th/LC_MESSAGES/totem.mo share/locale/tr/LC_MESSAGES/totem.mo share/locale/uk/LC_MESSAGES/totem.mo share/locale/vi/LC_MESSAGES/totem.mo @@ -135,5 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo @dirrm share/gnome/help/totem %%GSTREAMER%%@unexec rmdir lib/mozilla/plugins 2>/dev/null || /usr/bin/true %%GSTREAMER%%@unexec rmdir lib/mozilla 2>/dev/null || /usr/bin/true +@dirrm include/totem/1/plparser +@dirrm include/totem/1 +@dirrm include/totem @exec update-desktop-database > /dev/null || /usr/bin/true @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile index ee735aa98d5d..169dbc31877d 100644 --- a/net/gnome-netstatus/Makefile +++ b/net/gnome-netstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo index 1ad8a9f94236..48e9fbf2c961 100644 --- a/net/gnome-netstatus/distinfo +++ b/net/gnome-netstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 -SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 +MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 +SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c index 1ffae4384ecb..64c9ad52f8c9 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-iface.c @@ -1,16 +1,15 @@ ---- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 -+++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 -@@ -32,6 +32,8 @@ +--- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 ++++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 +@@ -33,6 +33,7 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> -+#include <sys/socket.h> #include <sys/ioctl.h> #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> -@@ -39,6 +41,7 @@ - #include <sys/param.h> +@@ -41,6 +42,7 @@ + #include <sys/socket.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c index a13a23161769..03e1d89c1d96 100644 --- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c @@ -1,5 +1,5 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 -+++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 ++++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005 @@ -35,6 +35,16 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> @@ -17,7 +17,7 @@ static inline gboolean parse_stats (char *buf, int prx_idx, -@@ -384,6 +394,163 @@ +@@ -384,6 +394,173 @@ } } @@ -37,16 +37,18 @@ + + s = socket (AF_INET, SOCK_DGRAM, 0); + -+ if (s == -1) { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } ++ if (s == -1) ++ { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } + -+ if (ioctl (s, req_type, &ifr) == -1) { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } ++ if (ioctl (s, req_type, &ifr) == -1) ++ { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } + + close (s); + return TRUE; @@ -110,35 +112,39 @@ + level = (int) (wreq.wi_val[1]); + +#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } ++ if (signal_strength <= 0) ++ { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) ++ { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) ++ { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } ++ else ++ { ++ signal_strength = cached; ++ } ++ } +#endif + + memcpy (signal_strength, &level, sizeof (signal_strength)); @@ -163,17 +169,21 @@ + *signal_strength = 0; + + if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && ++ g_strncasecmp (iface, "acx", 3)) + return error_message; + -+ if (g_strncasecmp (iface, "an", 2) == 0) { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } ++ if (g_strncasecmp (iface, "an", 2) == 0) ++ { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else ++ { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } + + return error_message; +} @@ -181,7 +191,42 @@ char * netstatus_sysdeps_read_iface_statistics (const char *iface, gulong *in_packets, -@@ -485,23 +652,6 @@ +@@ -413,11 +590,11 @@ + if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) + { + error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), +- command_line, +- error->message); ++ command_line, ++ error->message); + g_error_free (error); + g_free (command_line); +- ++ + return error_message; + } + g_free (command_line); +@@ -456,8 +633,8 @@ + g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); + + if (!parse_stats (buf, +- prx_idx, ptx_idx, in_packets, out_packets, +- brx_idx, btx_idx, in_bytes, out_bytes)) ++ prx_idx, ptx_idx, in_packets, out_packets, ++ brx_idx, btx_idx, in_bytes, out_bytes)) + { + error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " + "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), +@@ -477,7 +654,7 @@ + } + else + { +- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", ++ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", + iface, error->message); + g_error_free (error); + } +@@ -485,23 +662,6 @@ g_strfreev (argv); return error_message; diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist index b4258eef7f23..bf881c64c294 100644 --- a/net/gnome-netstatus/pkg-plist +++ b/net/gnome-netstatus/pkg-plist @@ -130,6 +130,7 @@ share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gl/LC_MESSAGES/gnome-netstatus.mo share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo @@ -142,6 +143,7 @@ share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nb/LC_MESSAGES/gnome-netstatus.mo +share/locale/ne/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo share/locale/nn/LC_MESSAGES/gnome-netstatus.mo share/locale/no/LC_MESSAGES/gnome-netstatus.mo diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile index fd1c3489b785..354f8005f5bc 100644 --- a/net/gnome-nettool/Makefile +++ b/net/gnome-nettool/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomenettool -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.0 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo index 68ada1f9d863..9606b0ac5244 100644 --- a/net/gnome-nettool/distinfo +++ b/net/gnome-nettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.0.0.tar.bz2) = a3261bd247960ba066b965c5a9a662e1 -SIZE (gnome2/gnome-nettool-1.0.0.tar.bz2) = 515045 +MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a +SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c index 0891475e90ff..2d95d26204ac 100644 --- a/net/gnome-nettool/files/patch-src_info.c +++ b/net/gnome-nettool/files/patch-src_info.c @@ -1,6 +1,14 @@ ---- src/info.c.orig Mon Jun 14 06:52:59 2004 -+++ src/info.c Sun Oct 31 23:35:06 2004 -@@ -37,6 +37,11 @@ +--- src/info.c.orig Tue Feb 1 06:05:58 2005 ++++ src/info.c Thu Mar 3 23:39:57 2005 +@@ -20,6 +20,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #ifdef HAVE_CONFIG_H + # include <config.h> +@@ -38,6 +39,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -12,7 +20,7 @@ #include "info.h" #include "utils.h" -@@ -57,6 +62,7 @@ +@@ -58,6 +64,7 @@ { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, @@ -20,7 +28,7 @@ { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -97,9 +103,42 @@ +@@ -128,9 +135,42 @@ { gint i; gchar *path; @@ -65,7 +73,7 @@ (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); if (info_iface_desc[i].pixbuf == NULL) { path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -187,17 +226,26 @@ +@@ -217,38 +257,87 @@ gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -96,10 +104,9 @@ g_return_val_if_fail (info != NULL, FALSE); model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); -@@ -206,21 +254,61 @@ - else + text = info_get_nic (info); + if (!text) return FALSE; - /*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/ - + #if defined(__linux__) @@ -160,7 +167,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -248,7 +336,9 @@ +@@ -276,7 +365,9 @@ } g_io_channel_unref (io); @@ -171,7 +178,7 @@ return TRUE; } -@@ -382,8 +472,16 @@ +@@ -405,8 +496,16 @@ InfoIpAddr *ip; gint flags; mii_data_result data; @@ -188,7 +195,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -429,7 +527,9 @@ +@@ -452,7 +551,9 @@ ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -198,7 +205,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -460,6 +560,45 @@ +@@ -483,6 +584,45 @@ (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c index 51f11e3f1e96..cae4f648fdf8 100644 --- a/net/gnome-nettool/files/patch-src_nettool.c +++ b/net/gnome-nettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig Wed Dec 22 07:07:36 2004 -+++ src/nettool.c Mon Dec 27 21:22:28 2004 -@@ -21,6 +21,7 @@ - #include <gnome.h> +--- src/nettool.c.orig Fri Jan 7 23:13:56 2005 ++++ src/nettool.c Mon Jan 24 21:03:48 2005 +@@ -22,6 +22,7 @@ + #include <glib/gi18n.h> #include <sys/types.h> #include <sys/socket.h> +#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -361,6 +362,10 @@ +@@ -357,6 +358,10 @@ len, NULL); } @@ -19,17 +19,15 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -372,12 +377,14 @@ +@@ -368,12 +373,13 @@ } g_string_append_c (netinfo->command_output, buf[0]); } + + g_free (text); -+ + return TRUE; } else if (status == G_IO_STATUS_EOF) { -- } -+ } + } g_free (text); - diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist index a61ce1a0947e..b1f5ab614ccf 100644 --- a/net/gnome-nettool/pkg-plist +++ b/net/gnome-nettool/pkg-plist @@ -24,21 +24,26 @@ share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo share/locale/es/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo +share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo share/locale/fr/LC_MESSAGES/gnome-nettool.mo share/locale/ga/LC_MESSAGES/gnome-nettool.mo share/locale/gl/LC_MESSAGES/gnome-nettool.mo share/locale/gu/LC_MESSAGES/gnome-nettool.mo share/locale/he/LC_MESSAGES/gnome-nettool.mo +share/locale/hr/LC_MESSAGES/gnome-nettool.mo share/locale/hu/LC_MESSAGES/gnome-nettool.mo share/locale/id/LC_MESSAGES/gnome-nettool.mo share/locale/it/LC_MESSAGES/gnome-nettool.mo share/locale/ja/LC_MESSAGES/gnome-nettool.mo share/locale/ko/LC_MESSAGES/gnome-nettool.mo share/locale/lt/LC_MESSAGES/gnome-nettool.mo +share/locale/mk/LC_MESSAGES/gnome-nettool.mo +share/locale/ml/LC_MESSAGES/gnome-nettool.mo share/locale/mn/LC_MESSAGES/gnome-nettool.mo share/locale/ms/LC_MESSAGES/gnome-nettool.mo share/locale/nb/LC_MESSAGES/gnome-nettool.mo +share/locale/ne/LC_MESSAGES/gnome-nettool.mo share/locale/nl/LC_MESSAGES/gnome-nettool.mo share/locale/no/LC_MESSAGES/gnome-nettool.mo share/locale/pa/LC_MESSAGES/gnome-nettool.mo @@ -53,6 +58,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo share/locale/sv/LC_MESSAGES/gnome-nettool.mo share/locale/ta/LC_MESSAGES/gnome-nettool.mo +share/locale/th/LC_MESSAGES/gnome-nettool.mo share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile index ee735aa98d5d..169dbc31877d 100644 --- a/net/gnomenetstatus/Makefile +++ b/net/gnomenetstatus/Makefile @@ -6,11 +6,10 @@ # PORTNAME= gnomenetstatus -PORTVERSION= 2.8.0 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.8 +MASTER_SITE_SUBDIR= sources/gnome-netstatus/2.10 DISTNAME= gnome-netstatus-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo index 1ad8a9f94236..48e9fbf2c961 100644 --- a/net/gnomenetstatus/distinfo +++ b/net/gnomenetstatus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-netstatus-2.8.0.tar.bz2) = fadc8a26ff7142e1372740d2edc435b1 -SIZE (gnome2/gnome-netstatus-2.8.0.tar.bz2) = 492599 +MD5 (gnome2/gnome-netstatus-2.10.0.tar.bz2) = b1a044cfbe3299e00d514d966d4766e8 +SIZE (gnome2/gnome-netstatus-2.10.0.tar.bz2) = 510277 diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c index 1ffae4384ecb..64c9ad52f8c9 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-iface.c @@ -1,16 +1,15 @@ ---- src/netstatus-iface.c.orig Mon Mar 22 17:49:17 2004 -+++ src/netstatus-iface.c Mon Mar 22 17:50:12 2004 -@@ -32,6 +32,8 @@ +--- src/netstatus-iface.c.orig Tue Nov 30 18:35:23 2004 ++++ src/netstatus-iface.c Tue Nov 30 18:35:43 2004 +@@ -33,6 +33,7 @@ #include <libgnome/gnome-i18n.h> +#include <sys/types.h> -+#include <sys/socket.h> #include <sys/ioctl.h> #ifdef HAVE_SYS_SOCKIO_H #include <sys/sockio.h> -@@ -39,6 +41,7 @@ - #include <sys/param.h> +@@ -41,6 +42,7 @@ + #include <sys/socket.h> #include <net/if.h> #include <net/if_arp.h> +#include <netinet/in.h> diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c index a13a23161769..03e1d89c1d96 100644 --- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c +++ b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c @@ -1,5 +1,5 @@ ---- src/netstatus-sysdeps.c.orig Fri Jul 30 04:19:31 2004 -+++ src/netstatus-sysdeps.c Tue Sep 21 00:27:19 2004 +--- src/netstatus-sysdeps.c.orig Fri Jul 30 04:21:30 2004 ++++ src/netstatus-sysdeps.c Thu Mar 3 03:04:41 2005 @@ -35,6 +35,16 @@ #include <glib.h> #include <libgnome/gnome-i18n.h> @@ -17,7 +17,7 @@ static inline gboolean parse_stats (char *buf, int prx_idx, -@@ -384,6 +394,163 @@ +@@ -384,6 +394,173 @@ } } @@ -37,16 +37,18 @@ + + s = socket (AF_INET, SOCK_DGRAM, 0); + -+ if (s == -1) { -+ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); -+ return FALSE; -+ } ++ if (s == -1) ++ { ++ *error = g_strdup_printf (_("Could not connect to interface, '%s'"), iface); ++ return FALSE; ++ } + -+ if (ioctl (s, req_type, &ifr) == -1) { -+ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); -+ close (s); -+ return FALSE; -+ } ++ if (ioctl (s, req_type, &ifr) == -1) ++ { ++ *error = g_strdup_printf (_("Could not send ioctl to interface, '%s'"), iface); ++ close (s); ++ return FALSE; ++ } + + close (s); + return TRUE; @@ -110,35 +112,39 @@ + level = (int) (wreq.wi_val[1]); + +#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time (NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero ((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) -+ return error; -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } ++ if (signal_strength <= 0) ++ { ++ /* we fail to get signal strength by usual means, try another way */ ++ static time_t last_scan; ++ static long int cached; ++ time_t now = time (NULL); ++ ++ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ ++ if (now > last_scan + 5) ++ { ++ struct wi_apinfo *w; ++ int nstations; ++ ++ bzero ((char *)&wreq, sizeof(wreq)); ++ wreq.wi_len = WI_MAX_DATALEN; ++ wreq.wi_type = WI_RID_READ_APS; ++ if (!wireless_getval (iface, (gpointer) &wreq, SIOCGWAVELAN, &error)) ++ return error; ++ nstations = *(int *)wreq.wi_val; ++ if (nstations > 0) ++ { ++ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); ++ signal_strength = (long int)w->signal; ++ } ++ ++ cached = signal_strength; ++ last_scan = now; ++ } ++ else ++ { ++ signal_strength = cached; ++ } ++ } +#endif + + memcpy (signal_strength, &level, sizeof (signal_strength)); @@ -163,17 +169,21 @@ + *signal_strength = 0; + + if (g_strncasecmp (iface, "an", 2) && g_strncasecmp (iface, "wi", 2) && -+ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4)) ++ g_strncasecmp (iface, "ath", 3) && g_strncasecmp (iface, "ndis", 4) && ++ g_strncasecmp (iface, "ipw", 3) && g_strncasecmp (iface, "iwi", 3) && ++ g_strncasecmp (iface, "acx", 3)) + return error_message; + -+ if (g_strncasecmp (iface, "an", 2) == 0) { -+ error_message = get_an_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } -+ else { -+ error_message = get_wi_data (iface, signal_strength); -+ *is_wireless = TRUE; -+ } ++ if (g_strncasecmp (iface, "an", 2) == 0) ++ { ++ error_message = get_an_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } ++ else ++ { ++ error_message = get_wi_data (iface, signal_strength); ++ *is_wireless = TRUE; ++ } + + return error_message; +} @@ -181,7 +191,42 @@ char * netstatus_sysdeps_read_iface_statistics (const char *iface, gulong *in_packets, -@@ -485,23 +652,6 @@ +@@ -413,11 +590,11 @@ + if (!g_shell_parse_argv (command_line, NULL, &argv, &error)) + { + error_message = g_strdup_printf (_("Could not parse command line '%s': %s"), +- command_line, +- error->message); ++ command_line, ++ error->message); + g_error_free (error); + g_free (command_line); +- ++ + return error_message; + } + g_free (command_line); +@@ -456,8 +633,8 @@ + g_io_channel_read_line (channel, &buf, NULL, NULL, NULL); + + if (!parse_stats (buf, +- prx_idx, ptx_idx, in_packets, out_packets, +- brx_idx, btx_idx, in_bytes, out_bytes)) ++ prx_idx, ptx_idx, in_packets, out_packets, ++ brx_idx, btx_idx, in_bytes, out_bytes)) + { + error_message = g_strdup_printf (_("Could not parse interface statistics from '%s'. " + "prx_idx = %d; ptx_idx = %d; brx_idx = %d; btx_idx = %d;"), +@@ -477,7 +654,7 @@ + } + else + { +- error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", ++ error_message = g_strdup_printf ("Error running /usr/bin/netstat for '%s': %s", + iface, error->message); + g_error_free (error); + } +@@ -485,23 +662,6 @@ g_strfreev (argv); return error_message; diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist index b4258eef7f23..bf881c64c294 100644 --- a/net/gnomenetstatus/pkg-plist +++ b/net/gnomenetstatus/pkg-plist @@ -130,6 +130,7 @@ share/locale/eu/LC_MESSAGES/gnome-netstatus.mo share/locale/fi/LC_MESSAGES/gnome-netstatus.mo share/locale/fr/LC_MESSAGES/gnome-netstatus.mo share/locale/ga/LC_MESSAGES/gnome-netstatus.mo +share/locale/gl/LC_MESSAGES/gnome-netstatus.mo share/locale/gu/LC_MESSAGES/gnome-netstatus.mo share/locale/hi/LC_MESSAGES/gnome-netstatus.mo share/locale/hr/LC_MESSAGES/gnome-netstatus.mo @@ -142,6 +143,7 @@ share/locale/lt/LC_MESSAGES/gnome-netstatus.mo share/locale/mn/LC_MESSAGES/gnome-netstatus.mo share/locale/ms/LC_MESSAGES/gnome-netstatus.mo share/locale/nb/LC_MESSAGES/gnome-netstatus.mo +share/locale/ne/LC_MESSAGES/gnome-netstatus.mo share/locale/nl/LC_MESSAGES/gnome-netstatus.mo share/locale/nn/LC_MESSAGES/gnome-netstatus.mo share/locale/no/LC_MESSAGES/gnome-netstatus.mo diff --git a/net/gnomenettool/Makefile b/net/gnomenettool/Makefile index fd1c3489b785..354f8005f5bc 100644 --- a/net/gnomenettool/Makefile +++ b/net/gnomenettool/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gnomenettool -PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTVERSION= 1.2.0 PORTEPOCH= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-nettool/1.0 +MASTER_SITE_SUBDIR= sources/gnome-nettool/1.2 DISTNAME= gnome-nettool-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/net/gnomenettool/distinfo b/net/gnomenettool/distinfo index 68ada1f9d863..9606b0ac5244 100644 --- a/net/gnomenettool/distinfo +++ b/net/gnomenettool/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-nettool-1.0.0.tar.bz2) = a3261bd247960ba066b965c5a9a662e1 -SIZE (gnome2/gnome-nettool-1.0.0.tar.bz2) = 515045 +MD5 (gnome2/gnome-nettool-1.2.0.tar.bz2) = 277338cf5d54ae9941260dd993a14f7a +SIZE (gnome2/gnome-nettool-1.2.0.tar.bz2) = 572511 diff --git a/net/gnomenettool/files/patch-src_info.c b/net/gnomenettool/files/patch-src_info.c index 0891475e90ff..2d95d26204ac 100644 --- a/net/gnomenettool/files/patch-src_info.c +++ b/net/gnomenettool/files/patch-src_info.c @@ -1,6 +1,14 @@ ---- src/info.c.orig Mon Jun 14 06:52:59 2004 -+++ src/info.c Sun Oct 31 23:35:06 2004 -@@ -37,6 +37,11 @@ +--- src/info.c.orig Tue Feb 1 06:05:58 2005 ++++ src/info.c Thu Mar 3 23:39:57 2005 +@@ -20,6 +20,7 @@ + #include <gtk/gtk.h> + #include <glib/gi18n.h> + #include <glib/gprintf.h> ++#include <sys/types.h> + + #ifdef HAVE_CONFIG_H + # include <config.h> +@@ -38,6 +39,11 @@ #include <sys/ioctl.h> #include <stdlib.h> #include <net/if.h> @@ -12,7 +20,7 @@ #include "info.h" #include "utils.h" -@@ -57,6 +62,7 @@ +@@ -58,6 +64,7 @@ { N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL }, { N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL }, { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL }, @@ -20,7 +28,7 @@ { N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL }, { N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL }, { N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL }, -@@ -97,9 +103,42 @@ +@@ -128,9 +135,42 @@ { gint i; gchar *path; @@ -65,7 +73,7 @@ (*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name); if (info_iface_desc[i].pixbuf == NULL) { path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL); -@@ -187,17 +226,26 @@ +@@ -217,38 +257,87 @@ gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; */ gchar iface[30]; /*, flags[30]; */ @@ -96,10 +104,9 @@ g_return_val_if_fail (info != NULL, FALSE); model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo)); -@@ -206,21 +254,61 @@ - else + text = info_get_nic (info); + if (!text) return FALSE; - /*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/ - + #if defined(__linux__) @@ -160,7 +167,7 @@ if (g_ascii_strcasecmp (iface, text) == 0) { /* -@@ -248,7 +336,9 @@ +@@ -276,7 +365,9 @@ } g_io_channel_unref (io); @@ -171,7 +178,7 @@ return TRUE; } -@@ -382,8 +472,16 @@ +@@ -405,8 +496,16 @@ InfoIpAddr *ip; gint flags; mii_data_result data; @@ -188,7 +195,7 @@ for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) { if (strcmp (ifr6->ifa_name, nic) != 0) { -@@ -429,7 +527,9 @@ +@@ -452,7 +551,9 @@ ifc.ifc_req = (struct ifreq *) buf; ioctl (sockfd, SIOCGIFCONF, &ifc); @@ -198,7 +205,7 @@ for (ptr = buf; ptr < buf + ifc.ifc_len;) { ifr = (struct ifreq *) ptr; -@@ -460,6 +560,45 @@ +@@ -483,6 +584,45 @@ (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[3], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[4], (int) ((guchar *) &ifrcopy.ifr_hwaddr.sa_data)[5]); diff --git a/net/gnomenettool/files/patch-src_nettool.c b/net/gnomenettool/files/patch-src_nettool.c index 51f11e3f1e96..cae4f648fdf8 100644 --- a/net/gnomenettool/files/patch-src_nettool.c +++ b/net/gnomenettool/files/patch-src_nettool.c @@ -1,14 +1,14 @@ ---- src/nettool.c.orig Wed Dec 22 07:07:36 2004 -+++ src/nettool.c Mon Dec 27 21:22:28 2004 -@@ -21,6 +21,7 @@ - #include <gnome.h> +--- src/nettool.c.orig Fri Jan 7 23:13:56 2005 ++++ src/nettool.c Mon Jan 24 21:03:48 2005 +@@ -22,6 +22,7 @@ + #include <glib/gi18n.h> #include <sys/types.h> #include <sys/socket.h> +#include <netinet/in.h> #include <signal.h> #include <errno.h> #include <sys/wait.h> -@@ -361,6 +362,10 @@ +@@ -357,6 +358,10 @@ len, NULL); } @@ -19,17 +19,15 @@ } else if (status == G_IO_STATUS_AGAIN) { char buf[1]; -@@ -372,12 +377,14 @@ +@@ -368,12 +373,13 @@ } g_string_append_c (netinfo->command_output, buf[0]); } + + g_free (text); -+ + return TRUE; } else if (status == G_IO_STATUS_EOF) { -- } -+ } + } g_free (text); - diff --git a/net/gnomenettool/pkg-plist b/net/gnomenettool/pkg-plist index a61ce1a0947e..b1f5ab614ccf 100644 --- a/net/gnomenettool/pkg-plist +++ b/net/gnomenettool/pkg-plist @@ -24,21 +24,26 @@ share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo share/locale/es/LC_MESSAGES/gnome-nettool.mo share/locale/eu/LC_MESSAGES/gnome-nettool.mo +share/locale/fa/LC_MESSAGES/gnome-nettool.mo share/locale/fi/LC_MESSAGES/gnome-nettool.mo share/locale/fr/LC_MESSAGES/gnome-nettool.mo share/locale/ga/LC_MESSAGES/gnome-nettool.mo share/locale/gl/LC_MESSAGES/gnome-nettool.mo share/locale/gu/LC_MESSAGES/gnome-nettool.mo share/locale/he/LC_MESSAGES/gnome-nettool.mo +share/locale/hr/LC_MESSAGES/gnome-nettool.mo share/locale/hu/LC_MESSAGES/gnome-nettool.mo share/locale/id/LC_MESSAGES/gnome-nettool.mo share/locale/it/LC_MESSAGES/gnome-nettool.mo share/locale/ja/LC_MESSAGES/gnome-nettool.mo share/locale/ko/LC_MESSAGES/gnome-nettool.mo share/locale/lt/LC_MESSAGES/gnome-nettool.mo +share/locale/mk/LC_MESSAGES/gnome-nettool.mo +share/locale/ml/LC_MESSAGES/gnome-nettool.mo share/locale/mn/LC_MESSAGES/gnome-nettool.mo share/locale/ms/LC_MESSAGES/gnome-nettool.mo share/locale/nb/LC_MESSAGES/gnome-nettool.mo +share/locale/ne/LC_MESSAGES/gnome-nettool.mo share/locale/nl/LC_MESSAGES/gnome-nettool.mo share/locale/no/LC_MESSAGES/gnome-nettool.mo share/locale/pa/LC_MESSAGES/gnome-nettool.mo @@ -53,6 +58,7 @@ share/locale/sr/LC_MESSAGES/gnome-nettool.mo share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo share/locale/sv/LC_MESSAGES/gnome-nettool.mo share/locale/ta/LC_MESSAGES/gnome-nettool.mo +share/locale/th/LC_MESSAGES/gnome-nettool.mo share/locale/tr/LC_MESSAGES/gnome-nettool.mo share/locale/uk/LC_MESSAGES/gnome-nettool.mo share/locale/vi/LC_MESSAGES/gnome-nettool.mo diff --git a/net/vino/Makefile b/net/vino/Makefile index df3d97b11d66..fbe9e90e857d 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -6,10 +6,10 @@ # PORTNAME= vino -PORTVERSION= 2.8.1 +PORTVERSION= 2.10.0 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 MAINTAINER= gnome@FreeBSD.org COMMENT= VNC server that allows for remote access to your GNOME desktop diff --git a/net/vino/distinfo b/net/vino/distinfo index 6785d59f40ee..b7aee1de50d9 100644 --- a/net/vino/distinfo +++ b/net/vino/distinfo @@ -1,2 +1,2 @@ -MD5 (vino-2.8.1.tar.bz2) = 2005c5df2481f6d4f16d37a750989199 -SIZE (vino-2.8.1.tar.bz2) = 542710 +MD5 (vino-2.10.0.tar.bz2) = a9b5c811807e01e7fb420f52820f0150 +SIZE (vino-2.10.0.tar.bz2) = 581602 diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist index 551b7dc0c42e..9d7a4550c201 100644 --- a/net/vino/pkg-plist +++ b/net/vino/pkg-plist @@ -2,10 +2,10 @@ bin/vino-preferences bin/vino-session libdata/bonobo/servers/GNOME_RemoteDesktop.server libexec/vino-server -share/gnome/control-center-2.0/capplets/vino-preferences.desktop -share/gnome/pixmaps/gnome-remote-desktop.png +share/gnome/applications/vino-preferences.desktop share/gnome/vino/vino-preferences.glade share/gnome/vino/vino-prompt.glade +share/icons/hicolor/48x48/apps/gnome-remote-desktop.png share/locale/ar/LC_MESSAGES/vino.mo share/locale/az/LC_MESSAGES/vino.mo share/locale/bg/LC_MESSAGES/vino.mo @@ -13,24 +13,30 @@ share/locale/bn/LC_MESSAGES/vino.mo share/locale/bs/LC_MESSAGES/vino.mo share/locale/ca/LC_MESSAGES/vino.mo share/locale/cs/LC_MESSAGES/vino.mo +share/locale/cy/LC_MESSAGES/vino.mo share/locale/da/LC_MESSAGES/vino.mo share/locale/de/LC_MESSAGES/vino.mo share/locale/el/LC_MESSAGES/vino.mo share/locale/en_CA/LC_MESSAGES/vino.mo share/locale/en_GB/LC_MESSAGES/vino.mo share/locale/es/LC_MESSAGES/vino.mo +share/locale/et/LC_MESSAGES/vino.mo share/locale/eu/LC_MESSAGES/vino.mo share/locale/fi/LC_MESSAGES/vino.mo share/locale/fr/LC_MESSAGES/vino.mo share/locale/gu/LC_MESSAGES/vino.mo +share/locale/hi/LC_MESSAGES/vino.mo share/locale/hu/LC_MESSAGES/vino.mo share/locale/id/LC_MESSAGES/vino.mo share/locale/it/LC_MESSAGES/vino.mo share/locale/ja/LC_MESSAGES/vino.mo share/locale/ko/LC_MESSAGES/vino.mo +share/locale/lt/LC_MESSAGES/vino.mo share/locale/mk/LC_MESSAGES/vino.mo +share/locale/mn/LC_MESSAGES/vino.mo share/locale/ms/LC_MESSAGES/vino.mo share/locale/nb/LC_MESSAGES/vino.mo +share/locale/ne/LC_MESSAGES/vino.mo share/locale/nl/LC_MESSAGES/vino.mo share/locale/nn/LC_MESSAGES/vino.mo share/locale/no/LC_MESSAGES/vino.mo @@ -41,6 +47,7 @@ share/locale/pt/LC_MESSAGES/vino.mo share/locale/pt_BR/LC_MESSAGES/vino.mo share/locale/ro/LC_MESSAGES/vino.mo share/locale/ru/LC_MESSAGES/vino.mo +share/locale/sk/LC_MESSAGES/vino.mo share/locale/sq/LC_MESSAGES/vino.mo share/locale/sr/LC_MESSAGES/vino.mo share/locale/sr@Latn/LC_MESSAGES/vino.mo @@ -48,6 +55,7 @@ share/locale/sv/LC_MESSAGES/vino.mo share/locale/ta/LC_MESSAGES/vino.mo share/locale/tr/LC_MESSAGES/vino.mo share/locale/uk/LC_MESSAGES/vino.mo +share/locale/vi/LC_MESSAGES/vino.mo share/locale/zh_CN/LC_MESSAGES/vino.mo share/locale/zh_TW/LC_MESSAGES/vino.mo @dirrm share/gnome/vino diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 01ebea9e1f53..aaf9c653ed0f 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprint -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= print gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo index ed905ab23de3..ca72064cb021 100644 --- a/print/libgnomeprint/distinfo +++ b/print/libgnomeprint/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprint-2.8.2.tar.bz2) = 8361c4e1bc3d87b91435807d0c06a3e4 -SIZE (gnome2/libgnomeprint-2.8.2.tar.bz2) = 766574 +MD5 (gnome2/libgnomeprint-2.10.0.tar.bz2) = a8cd7e55c5ee9da019b2257eff83ce35 +SIZE (gnome2/libgnomeprint-2.10.0.tar.bz2) = 723285 diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist index ac9d5eea27dc..5951b019c27b 100644 --- a/print/libgnomeprint/pkg-plist +++ b/print/libgnomeprint/pkg-plist @@ -6,6 +6,7 @@ include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-pango.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-pgl.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-config.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-job.h +include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-meta.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-paper.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-transport.h include/libgnomeprint-%%LIBVERSION%%/libgnomeprint/gnome-print-unit.h @@ -112,6 +113,7 @@ share/locale/mn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/mr/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/ms/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nb/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo +share/locale/ne/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nl/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/nn/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo share/locale/no/LC_MESSAGES/libgnomeprint-%%LIBVERSION%%.mo diff --git a/sysutils/Makefile b/sysutils/Makefile index 2826535d46ba..82719d1b17b6 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -438,6 +438,7 @@ SUBDIR += symlinks SUBDIR += synergy SUBDIR += syslog-ng + SUBDIR += system-tools-backends SUBDIR += tcplist SUBDIR += tct SUBDIR += tdir diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile index a38998eadd35..e1eb4d78c2d0 100644 --- a/sysutils/gconf-editor/Makefile +++ b/sysutils/gconf-editor/Makefile @@ -6,12 +6,11 @@ # PORTNAME= gconf-editor -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.10.0 PORTEPOCH= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo index 31bf7e95fecc..c8cc01673e98 100644 --- a/sysutils/gconf-editor/distinfo +++ b/sysutils/gconf-editor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gconf-editor-2.8.2.tar.bz2) = 193d5970b570366fd435b2b7ebdd8047 -SIZE (gnome2/gconf-editor-2.8.2.tar.bz2) = 510014 +MD5 (gnome2/gconf-editor-2.10.0.tar.bz2) = 651a18f7eb5af91761521aa4f04ccc07 +SIZE (gnome2/gconf-editor-2.10.0.tar.bz2) = 543405 diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist index 0a6b2d232ef9..b24a6c9a4c40 100644 --- a/sysutils/gconf-editor/pkg-plist +++ b/sysutils/gconf-editor/pkg-plist @@ -10,7 +10,6 @@ share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png share/gnome/help/gconf-editor/C/gconf-editor.xml share/gnome/help/gconf-editor/C/legal.xml share/gnome/omf/gconf-editor/gconf-editor-C.omf -share/gnome/pixmaps/gconf-editor.png share/gnome/pixmaps/gconf-editor/entry-blank.png share/gnome/pixmaps/gconf-editor/entry-bool.png share/gnome/pixmaps/gconf-editor/entry-list.png @@ -19,6 +18,7 @@ share/gnome/pixmaps/gconf-editor/entry-schema.png share/gnome/pixmaps/gconf-editor/entry-string.png share/gnome/pixmaps/gconf-editor/folder-closed.png share/gnome/pixmaps/gconf-editor/folder-open.png +share/icons/hicolor/48x48/apps/gconf-editor.png share/locale/am/LC_MESSAGES/gconf-editor.mo share/locale/ar/LC_MESSAGES/gconf-editor.mo share/locale/az/LC_MESSAGES/gconf-editor.mo diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index acbe1f0c2451..075ee3b879d6 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,27 +6,26 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.8.2 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.8 +MASTER_SITE_SUBDIR= sources/control-center/2.10 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= xklavier.8:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \ - desktopfileutils USE_GSTREAMER= yes +USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ + gnomemenus desktopfileutils USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -42,6 +41,8 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c post-install: @-update-desktop-database diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index e5ac6888440c..e8ada3e49980 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f -SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342 +MD5 (gnome2/control-center-2.10.0.tar.bz2) = 23ee64b8e559cce4aa6beb70ad675130 +SIZE (gnome2/control-center-2.10.0.tar.bz2) = 2617716 diff --git a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c deleted file mode 100644 index c6b38bd4daa6..000000000000 --- a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c +++ /dev/null @@ -1,18 +0,0 @@ ---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig Sun Feb 20 16:18:03 2005 -+++ capplets/default-applications/gnome-default-applications-properties-structs.c Mon Feb 21 15:52:04 2005 -@@ -12,6 +12,7 @@ - { N_("Firebird/FireFox"), "mozilla-firebird", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "mozilla-firefox", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "firefox", "mozilla-firefox %s", FALSE, FALSE }, -+ { N_("Firebird/FireFox"), "firefox", "firefox %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla-1.6", "mozilla-1.6 %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla", "mozilla %s", FALSE, FALSE }, - { N_("Netscape Communicator"), "netscape", "netscape %s", FALSE, FALSE }, -@@ -40,6 +41,7 @@ - { N_("Balsa"), "balsa", "balsa -m %s", FALSE, FALSE }, - { N_("KMail"), "kmail", "kmail %s", FALSE, FALSE }, - { N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE}, -+ { N_("Thunderbird"), "thunderbird", "thunderbird %s", FALSE, FALSE}, - { N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE }, - - }; diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in deleted file mode 100644 index 5a6b0ba8f2d6..000000000000 --- a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/desktop-links/Makefile.in.orig Tue Dec 30 15:55:28 2003 -+++ capplets/desktop-links/Makefile.in Tue Dec 30 15:55:49 2003 -@@ -190,7 +190,7 @@ - - pixmaps_pre = $(capplets:=-capplet.png) - pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png --pixmapsdir = $(datadir)/icons/gnome/48x48/apps -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - - desktop_files = $(capplets:=.desktop) - desktop_in_files = $(desktop_files:.desktop=.desktop.in) diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..02374b23ac45 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,33 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jan 19 18:16:13 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Feb 9 21:33:00 2005 +@@ -242,21 +242,25 @@ + Bool allowMultipleSelection, + GladeXML * dialog) + { ++ gchar *utfGroupName, *titlemarkup; ++ GtkWidget *expander; ++ GtkWidget *vbox; ++ GtkWidget *align; + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + + current1stLevelId = configItem->name; + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + +- GtkWidget *expander = gtk_expander_new (titlemarkup); ++ expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); + + g_free (titlemarkup); + gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); +- GtkWidget *align = gtk_alignment_new (0, 0, 1, 1); ++ align = gtk_alignment_new (0, 0, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0); +- GtkWidget *vbox = gtk_vbox_new (TRUE, 6); ++ vbox = gtk_vbox_new (TRUE, 6); + gtk_container_add (GTK_CONTAINER (align), vbox); + gtk_container_add (GTK_CONTAINER (expander), align); + currentVbox = vbox; 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 deleted file mode 100644 index 9c487d7b8e9d..000000000000 --- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index f97758e10ba0..d8e861724bd3 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Feb 21 15:53:01 2005 -+++ configure Mon Feb 21 15:53:01 2005 -@@ -21286,6 +21286,7 @@ +--- configure.orig Thu Jan 13 02:39:28 2005 ++++ configure Thu Jan 13 02:39:28 2005 +@@ -22221,6 +22221,7 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8,7 +8,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26646,7 +26647,7 @@ +@@ -27490,7 +27491,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in new file mode 100644 index 000000000000..52a627fb20df --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 ++++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 +@@ -296,7 +296,7 @@ + Datadir = $(datadir)/control-center-2.0/interfaces/ + Data_DATA = acme.glade + +-pixmapsdir = $(GNOMECC_PIXMAPS_DIR) ++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps + pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png + + EXTRA_DIST = \ diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 423c553037a3..8787f4495677 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -22,39 +22,36 @@ etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h -lib/bonobo/libthemus-theme-properties-view.so lib/gnome-vfs-2.0/modules/libfont-method.so lib/gnome-vfs-2.0/modules/libtheme-method.so lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/nautilus/extensions-1.0/libnautilus-fontilus.so +lib/nautilus/extensions-1.0/libnautilus-themus.so lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server -libdata/bonobo/servers/Themus_Properties_View.server -libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc -libexec/fontilus-context-menu libexec/gnome-settings-daemon -share/gnome/application-registry/fontilus.applications -share/gnome/application-registry/themus.applications +share/gnome/applications/accessibility-keyboard.desktop +share/gnome/applications/at-properties.desktop +share/gnome/applications/background.desktop +share/gnome/applications/default-applications.desktop +share/gnome/applications/display-properties.desktop +share/gnome/applications/font-properties.desktop share/gnome/applications/gnome-font-viewer.desktop +share/gnome/applications/gnome-network-preferences.desktop +share/gnome/applications/gnome-settings-mouse.desktop +share/gnome/applications/gnome-settings-sound.desktop +share/gnome/applications/gnome-ui-properties.desktop share/gnome/applications/gnomecc.desktop +share/gnome/applications/gtk-theme-selector.desktop +share/gnome/applications/keybinding.desktop +share/gnome/applications/keyboard.desktop +share/gnome/applications/themus-theme-applier.desktop +share/gnome/applications/window-properties.desktop @exec update-desktop-database > /dev/null || /usr/bin/true -share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop -share/gnome/control-center-2.0/capplets/at-properties.desktop -share/gnome/control-center-2.0/capplets/background.desktop -share/gnome/control-center-2.0/capplets/default-applications.desktop -share/gnome/control-center-2.0/capplets/display-properties.desktop -share/gnome/control-center-2.0/capplets/font-properties.desktop -share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop -share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop -share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop -share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop -share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop -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/window-properties.desktop share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade @@ -69,6 +66,7 @@ share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade +share/gnome/control-center-2.0/interfaces/modmap-dialog.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 @@ -77,8 +75,6 @@ share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png -share/gnome/control-center-2.0/pixmaps/acme-brightness.png -share/gnome/control-center-2.0/pixmaps/acme-eject.png share/gnome/control-center-2.0/pixmaps/at-startup.png share/gnome/control-center-2.0/pixmaps/at-support.png share/gnome/control-center-2.0/pixmaps/bar-disabled.png @@ -88,8 +84,6 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png -share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png -share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -117,23 +111,16 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad 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/mime-info/fontilus.keys -share/gnome/mime-info/fontilus.mime -share/gnome/mime-info/themus.keys -share/gnome/pixmaps/control-center2.png share/gnome/pixmaps/display-capplet.png -share/gnome/pixmaps/gnomecc-2/active.png -share/gnome/pixmaps/gnomecc-2/bcg_top.png -share/gnome/pixmaps/gnomecc-2/blank.png -share/gnome/pixmaps/gnomecc-2/title.png -share/gnome/vfolders/Accessibility.directory -share/gnome/vfolders/Advanced.directory share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/accessibility-directory.png +share/icons/gnome/48x48/apps/acme-brightness.png +share/icons/gnome/48x48/apps/acme-eject.png +share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png +share/icons/gnome/48x48/apps/gnome-speakernotes.png +share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo @@ -175,6 +162,7 @@ share/locale/ml/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/nb/LC_MESSAGES/control-center-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/control-center-2.0.mo @@ -200,17 +188,14 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/pixmaps/gnomecc-2 @dirrm share/gnome/gnome-background-properties @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@dirrm share/gnome/control-center-2.0/icons +@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 224e9f1a5756..7650bd4087ab 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.8 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 73b0b9a93148..7919d4274b50 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 3d4564b2d0b49a5826ae212b23d234df -SIZE (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 690661 +MD5 (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 6dc606f13600e49a52b669fb97e789e0 +SIZE (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 752223 diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c index 30ef6303d397..49a699641476 100644 --- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c +++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c @@ -1,28 +1,7 @@ ---- src/proctable.c.orig Sun Nov 21 18:03:12 2004 -+++ src/proctable.c Mon Dec 6 22:10:55 2004 -@@ -535,6 +535,9 @@ - glibtop_get_proc_uid (&procuid, pid); - glibtop_get_proc_time (&proctime, pid); - newcputime = proctime.utime + proctime.stime; -+ if (proctime.frequency) { -+ newcputime /= (proctime.frequency/100); -+ } - model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); +--- src/proctable.c.orig Tue Nov 30 01:28:31 2004 ++++ src/proctable.c Wed Dec 1 13:25:55 2004 +@@ -772,6 +772,12 @@ - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), -@@ -645,6 +648,10 @@ - glibtop_get_proc_uid (&procuid, pid); - glibtop_get_proc_time (&proctime, pid); - newcputime = proctime.utime + proctime.stime; -+ if (proctime.frequency) { -+ newcputime /= (proctime.frequency/100); -+ } -+ - - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), - pid, -@@ -745,6 +752,12 @@ - } +static int @@ -32,18 +11,15 @@ +} + static void - refresh_list (ProcData *data, const unsigned *pid_list, guint n) + refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -754,6 +767,8 @@ - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); - guint i; +@@ -863,10 +869,15 @@ + + pid_list = glibtop_get_proclist (&proclist, which, arg); -+ qsort (pid_list, n, sizeof (*pid_list), pid_compare); ++ qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare); + - /* Add or update processes */ - for(i = 0; i < n; ++i) { - ProcInfo *info; -@@ -837,6 +852,9 @@ + /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); total_time = cpu.total - total_time_last; diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.c b/sysutils/gnome-system-monitor/files/patch-src_interface.c new file mode 100644 index 000000000000..1b4276e7ee56 --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_interface.c @@ -0,0 +1,21 @@ +--- src/interface.c.orig Wed Dec 1 13:23:26 2004 ++++ src/interface.c Wed Dec 1 13:24:00 2004 +@@ -529,12 +529,12 @@ + + model = gtk_tree_store_new (10, + GDK_TYPE_PIXBUF, +- G_TYPE_STRING, // device name +- G_TYPE_STRING, // directory +- G_TYPE_STRING, // type +- G_TYPE_STRING, // total +- G_TYPE_STRING, // free +- G_TYPE_STRING, // used ++ G_TYPE_STRING, /* device name */ ++ G_TYPE_STRING, /* directory */ ++ G_TYPE_STRING, /* type */ ++ G_TYPE_STRING, /* total */ ++ G_TYPE_STRING, /* free */ ++ G_TYPE_STRING, /* used */ + G_TYPE_FLOAT, + G_TYPE_FLOAT, + G_TYPE_FLOAT); diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c new file mode 100644 index 000000000000..efdcef5f7882 --- /dev/null +++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c @@ -0,0 +1,32 @@ +--- src/openfiles.c.orig Fri Jan 21 18:35:43 2005 ++++ src/openfiles.c Tue Jan 25 19:02:29 2005 +@@ -8,6 +8,7 @@ + #include <netdb.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #include "procman.h" + #include "openfiles.h" +@@ -143,7 +144,7 @@ + const glibtop_open_files_entry *o2 = b; + + /* Falta manejar los diferentes tipos! */ +- return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX! ++ return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */ + } + + +@@ -152,10 +153,10 @@ + { + ProcInfo *info; + GtkTreeModel *model; +- glibtop_open_files_entry *openfiles; +- glibtop_proc_open_files procmap; + GHashTable *new_maps; + gint i; ++ glibtop_open_files_entry *openfiles; ++ glibtop_proc_open_files procmap; + + info = g_object_get_data (G_OBJECT (tree), "selected_info"); + g_return_if_fail (info); diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c deleted file mode 100644 index 288ccc26adc0..000000000000 --- a/sysutils/gnome-system-monitor/files/patch-src_util.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/util.c.orig Fri Dec 12 02:26:57 2003 -+++ src/util.c Fri Dec 12 02:35:38 2003 -@@ -16,6 +16,7 @@ - - #ifdef __FreeBSD__ - # include <errno.h> -+# include <termios.h> - # include <libutil.h> - #endif - -@@ -181,7 +182,11 @@ - * Make su think we're sending the password from a terminal: - */ - -+#ifndef __FreeBSD__ - if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) { -+#else -+ if ((t_fd = OPEN_TTY()) < 0) { -+#endif - fprintf (stderr, "Unable to open a terminal\n"); - ABORT (root); - } -@@ -259,7 +264,11 @@ - } - } - -+#ifndef __FreeBSD__ - if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { -+#else -+ if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { -+#endif - perror ("Unable to open pseudo slave terminal"); - _exit (-1); - } diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index b0fa0b688925..9d8082a83d19 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -16,7 +16,6 @@ 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 -share/gnome/pixmaps/procman.png share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo share/locale/az/LC_MESSAGES/gnome-system-monitor.mo @@ -33,6 +32,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo +share/locale/et/LC_MESSAGES/gnome-system-monitor.mo share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo @@ -56,6 +56,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo share/locale/no/LC_MESSAGES/gnome-system-monitor.mo share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo @@ -71,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo +share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index f1ce787bb4c6..1dca8a647c5c 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -6,23 +6,27 @@ # PORTNAME= gnomesystemtools -PORTVERSION= 1.0.2 +PORTVERSION= 1.2.0 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.0 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to configure workstations +BUILD_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends +RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends + USE_BZIP2= yes USE_GMAKE= yes -USE_PERL5= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -30,17 +34,11 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 +.if ${OSVERSION} >= 500000 CONFIGURE_ARGS+= --enable-services PLIST_SUB+= SERVICES="" .else PLIST_SUB+= SERVICES="@comment " .endif -.if ${PERL_LEVEL} < 500600 -post-configure: - @${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \ - ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g' -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo index 6b2fb5abceac..6eb37fa99a84 100644 --- a/sysutils/gnome-system-tools/distinfo +++ b/sysutils/gnome-system-tools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 674611d3fb195fde940223821cfa6dda -SIZE (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 2766787 +MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e +SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 diff --git a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in deleted file mode 100644 index 7f7cce28ee37..000000000000 --- a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in +++ /dev/null @@ -1,34 +0,0 @@ ---- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004 -+++ backends/replace.pl.in Fri Oct 22 02:42:48 2004 -@@ -1113,19 +1113,19 @@ - - return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)); - -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - $line_no ++; - - while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1) - { -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - $line_no ++; - } - - $line_no = 0; - if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface)) - { -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - } - - &gst_file_buffer_clean ($buff); -@@ -1663,7 +1663,7 @@ - } - else - { -- delete $$buff[$i]; -+ splice @{$buff},$i,1; - } - } - } diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure index b854cde3a70f..712bb1defc9f 100644 --- a/sysutils/gnome-system-tools/files/patch-configure +++ b/sysutils/gnome-system-tools/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 26 12:02:51 2004 -+++ configure Wed May 26 12:03:23 2004 -@@ -22623,7 +22623,7 @@ +--- configure.orig Thu Jan 13 17:15:39 2005 ++++ configure Thu Jan 13 17:17:13 2005 +@@ -22990,7 +22990,7 @@ GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS" GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a" diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c new file mode 100644 index 000000000000..9272d918136c --- /dev/null +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c @@ -0,0 +1,18 @@ +--- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 ++++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 +@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar + unsetenv("LANG"); + unsetenv("LANGUAGE"); + +- dup2 (p[1], 1); +- dup2 (p[1], 2); ++ dup2 (p[1], STDOUT_FILENO); ++ /*dup2 (p[1], 2);*/ + close (p[0]); + + execv (args[0], args); +- exit (255); ++ _exit (255); + } else { + #ifndef __FreeBSD__ + /* Linux's su works ok with echo disabling */ diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c new file mode 100644 index 000000000000..5134f30e581b --- /dev/null +++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c @@ -0,0 +1,11 @@ +--- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 ++++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 +@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) + struct pollfd fd; + + fd.fd = tool->read_fd; +- fd.events = POLLIN || POLLPRI; ++ fd.events = POLLIN | POLLPRI; + + while (poll (&fd, 1, 100) <= 0) { + while (gtk_events_pending ()) diff --git a/sysutils/gnome-system-tools/files/patch-src_network_location.c b/sysutils/gnome-system-tools/files/patch-src_network_location.c new file mode 100644 index 000000000000..e2577a6a49e0 --- /dev/null +++ b/sysutils/gnome-system-tools/files/patch-src_network_location.c @@ -0,0 +1,11 @@ +--- src/network/location.c.orig Thu Dec 23 13:16:33 2004 ++++ src/network/location.c Thu Dec 23 13:16:40 2004 +@@ -687,7 +687,7 @@ + static void + copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) + { +- gchar **string = (gchar **) list;; ++ gchar **string = (gchar **) list; + gchar *value; + + while (*string) diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist index 6a980fb7574e..a52125a51fcd 100644 --- a/sysutils/gnome-system-tools/pkg-plist +++ b/sysutils/gnome-system-tools/pkg-plist @@ -1,24 +1,23 @@ bin/network-admin %%SERVICES%%bin/services-admin +bin/shares-admin bin/time-admin bin/users-admin -etc/X11/sysconfig/network.desktop -%%SERVICES%%etc/X11/sysconfig/services.desktop -etc/X11/sysconfig/time.desktop -etc/X11/sysconfig/users.desktop +lib/nautilus/extensions-1.0/libnautilus-gst-shares.so libdata/pkgconfig/gnome-system-tools.pc -libdata/pkgconfig/system-tools-backends.pc share/gnome-system-tools/interfaces/boot.glade share/gnome-system-tools/interfaces/common.glade share/gnome-system-tools/interfaces/disks.glade share/gnome-system-tools/interfaces/network.glade share/gnome-system-tools/interfaces/services.glade +share/gnome-system-tools/interfaces/shares.glade share/gnome-system-tools/interfaces/time.glade share/gnome-system-tools/interfaces/users.glade share/gnome-system-tools/pixmaps/16_ethernet.xpm share/gnome-system-tools/pixmaps/16_loopback.xpm share/gnome-system-tools/pixmaps/16_plip.xpm share/gnome-system-tools/pixmaps/16_ppp.xpm +share/gnome-system-tools/pixmaps/archlinux.png share/gnome-system-tools/pixmaps/black_panther.png share/gnome-system-tools/pixmaps/boot.png share/gnome-system-tools/pixmaps/computer.png @@ -26,6 +25,7 @@ share/gnome-system-tools/pixmaps/conectiva.png share/gnome-system-tools/pixmaps/connection-ethernet.png share/gnome-system-tools/pixmaps/connection-modem.png share/gnome-system-tools/pixmaps/debian.png +share/gnome-system-tools/pixmaps/disks.png share/gnome-system-tools/pixmaps/fedora.png share/gnome-system-tools/pixmaps/freebsd.png share/gnome-system-tools/pixmaps/gentoo.png @@ -47,6 +47,7 @@ share/gnome-system-tools/pixmaps/redhat.png share/gnome-system-tools/pixmaps/server.png share/gnome-system-tools/pixmaps/services.png share/gnome-system-tools/pixmaps/settings.png +share/gnome-system-tools/pixmaps/shares.png share/gnome-system-tools/pixmaps/slackware.png share/gnome-system-tools/pixmaps/specifix.png share/gnome-system-tools/pixmaps/suse.png @@ -63,6 +64,7 @@ share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop %%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop share/gnome/help/boot-admin/C/boot-admin.xml @@ -90,145 +92,59 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo -share/locale/ar/LC_MESSAGES/setup-tools-backends.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo -share/locale/az/LC_MESSAGES/setup-tools-backends.mo share/locale/bg/LC_MESSAGES/gnome-system-tools.mo -share/locale/bg/LC_MESSAGES/setup-tools-backends.mo -share/locale/bn/LC_MESSAGES/setup-tools-backends.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo -share/locale/bs/LC_MESSAGES/setup-tools-backends.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo -share/locale/ca/LC_MESSAGES/setup-tools-backends.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo -share/locale/cs/LC_MESSAGES/setup-tools-backends.mo share/locale/da/LC_MESSAGES/gnome-system-tools.mo -share/locale/da/LC_MESSAGES/setup-tools-backends.mo share/locale/de/LC_MESSAGES/gnome-system-tools.mo -share/locale/de/LC_MESSAGES/setup-tools-backends.mo share/locale/el/LC_MESSAGES/gnome-system-tools.mo -share/locale/el/LC_MESSAGES/setup-tools-backends.mo share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo share/locale/es/LC_MESSAGES/gnome-system-tools.mo -share/locale/es/LC_MESSAGES/setup-tools-backends.mo share/locale/et/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/gnome-system-tools.mo -share/locale/eu/LC_MESSAGES/setup-tools-backends.mo share/locale/fi/LC_MESSAGES/gnome-system-tools.mo -share/locale/fi/LC_MESSAGES/setup-tools-backends.mo share/locale/fr/LC_MESSAGES/gnome-system-tools.mo -share/locale/fr/LC_MESSAGES/setup-tools-backends.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo -share/locale/gu/LC_MESSAGES/setup-tools-backends.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo -share/locale/hr/LC_MESSAGES/setup-tools-backends.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo share/locale/id/LC_MESSAGES/gnome-system-tools.mo -share/locale/id/LC_MESSAGES/setup-tools-backends.mo share/locale/it/LC_MESSAGES/gnome-system-tools.mo -share/locale/it/LC_MESSAGES/setup-tools-backends.mo share/locale/ja/LC_MESSAGES/gnome-system-tools.mo -share/locale/ja/LC_MESSAGES/setup-tools-backends.mo share/locale/ko/LC_MESSAGES/gnome-system-tools.mo -share/locale/ko/LC_MESSAGES/setup-tools-backends.mo share/locale/lt/LC_MESSAGES/gnome-system-tools.mo -share/locale/lt/LC_MESSAGES/setup-tools-backends.mo share/locale/lv/LC_MESSAGES/gnome-system-tools.mo share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo -share/locale/ms/LC_MESSAGES/setup-tools-backends.mo -share/locale/nb/LC_MESSAGES/gnome-system-tools.mo -share/locale/nb/LC_MESSAGES/setup-tools-backends.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo -share/locale/nl/LC_MESSAGES/setup-tools-backends.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo -share/locale/no/LC_MESSAGES/setup-tools-backends.mo -share/locale/pa/LC_MESSAGES/setup-tools-backends.mo share/locale/pa/LC_MESSAGES/gnome-system-tools.mo share/locale/pl/LC_MESSAGES/gnome-system-tools.mo -share/locale/pl/LC_MESSAGES/setup-tools-backends.mo share/locale/pt/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt/LC_MESSAGES/setup-tools-backends.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo -share/locale/ro/LC_MESSAGES/setup-tools-backends.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo -share/locale/sq/LC_MESSAGES/setup-tools-backends.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr/LC_MESSAGES/setup-tools-backends.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo share/locale/sv/LC_MESSAGES/gnome-system-tools.mo -share/locale/sv/LC_MESSAGES/setup-tools-backends.mo share/locale/ta/LC_MESSAGES/gnome-system-tools.mo -share/locale/ta/LC_MESSAGES/setup-tools-backends.mo +share/locale/th/LC_MESSAGES/gnome-system-tools.mo share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo -share/locale/uk/LC_MESSAGES/setup-tools-backends.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo -share/setup-tool-backends/files/debian_ipchains -share/setup-tool-backends/scripts/boot-conf -share/setup-tool-backends/scripts/boot-grub.pl -share/setup-tool-backends/scripts/boot-lilo.pl -share/setup-tool-backends/scripts/boot-yaboot.pl -share/setup-tool-backends/scripts/boot.pl -share/setup-tool-backends/scripts/debug.pl -share/setup-tool-backends/scripts/dhcpd-conf -share/setup-tool-backends/scripts/dhcpd.pl -share/setup-tool-backends/scripts/disks-conf -share/setup-tool-backends/scripts/display-conf -share/setup-tool-backends/scripts/file.pl -share/setup-tool-backends/scripts/filesys.pl -share/setup-tool-backends/scripts/font-conf -share/setup-tool-backends/scripts/font.pl -share/setup-tool-backends/scripts/general.pl -share/setup-tool-backends/scripts/guess_system.sh -share/setup-tool-backends/scripts/internetsharing-conf -share/setup-tool-backends/scripts/ishare.pl -share/setup-tool-backends/scripts/media.pl -share/setup-tool-backends/scripts/memory-conf -share/setup-tool-backends/scripts/mouse-conf -share/setup-tool-backends/scripts/network-conf -share/setup-tool-backends/scripts/network.pl -share/setup-tool-backends/scripts/package-conf -share/setup-tool-backends/scripts/parse.pl -share/setup-tool-backends/scripts/partition.pl -share/setup-tool-backends/scripts/platform.pl -share/setup-tool-backends/scripts/print-conf -share/setup-tool-backends/scripts/print.pl -share/setup-tool-backends/scripts/replace.pl -share/setup-tool-backends/scripts/report.pl -share/setup-tool-backends/scripts/service-list.pl -share/setup-tool-backends/scripts/service.pl -share/setup-tool-backends/scripts/services-conf -share/setup-tool-backends/scripts/share.pl -share/setup-tool-backends/scripts/shares-conf -share/setup-tool-backends/scripts/time-conf -share/setup-tool-backends/scripts/tokenizer.pl -share/setup-tool-backends/scripts/type1inst -share/setup-tool-backends/scripts/users-conf -share/setup-tool-backends/scripts/util.pl -share/setup-tool-backends/scripts/x.pl -share/setup-tool-backends/scripts/xml.pl -@dirrm share/setup-tool-backends/scripts -@dirrm share/setup-tool-backends/files -@dirrm share/setup-tool-backends @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index acbe1f0c2451..075ee3b879d6 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,27 +6,26 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.8.2 -PORTREVISION= 2 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/control-center/2.8 +MASTER_SITE_SUBDIR= sources/control-center/2.10 DISTNAME= control-center-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for GNOME 2 project -LIB_DEPENDS= xklavier.8:${PORTSDIR}/x11/libxklavier +LIB_DEPENDS= xklavier.10:${PORTSDIR}/x11/libxklavier USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \ - desktopfileutils USE_GSTREAMER= yes +USE_GNOME= gnomeprefix gnomehack intlhack metacity nautilus2 \ + gnomemenus desktopfileutils USE_LIBTOOL_VER=15 INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -42,6 +41,8 @@ GCONF_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas \ post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g' + @${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \ + ${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c post-install: @-update-desktop-database diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index e5ac6888440c..e8ada3e49980 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f -SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342 +MD5 (gnome2/control-center-2.10.0.tar.bz2) = 23ee64b8e559cce4aa6beb70ad675130 +SIZE (gnome2/control-center-2.10.0.tar.bz2) = 2617716 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c deleted file mode 100644 index c6b38bd4daa6..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c +++ /dev/null @@ -1,18 +0,0 @@ ---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig Sun Feb 20 16:18:03 2005 -+++ capplets/default-applications/gnome-default-applications-properties-structs.c Mon Feb 21 15:52:04 2005 -@@ -12,6 +12,7 @@ - { N_("Firebird/FireFox"), "mozilla-firebird", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "mozilla-firefox", "mozilla-firebird %s", FALSE, FALSE }, - { N_("Firebird/FireFox"), "firefox", "mozilla-firefox %s", FALSE, FALSE }, -+ { N_("Firebird/FireFox"), "firefox", "firefox %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla-1.6", "mozilla-1.6 %s", FALSE, FALSE }, - { N_("Mozilla/Netscape 6"), "mozilla", "mozilla %s", FALSE, FALSE }, - { N_("Netscape Communicator"), "netscape", "netscape %s", FALSE, FALSE }, -@@ -40,6 +41,7 @@ - { N_("Balsa"), "balsa", "balsa -m %s", FALSE, FALSE }, - { N_("KMail"), "kmail", "kmail %s", FALSE, FALSE }, - { N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE}, -+ { N_("Thunderbird"), "thunderbird", "thunderbird %s", FALSE, FALSE}, - { N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE }, - - }; diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in deleted file mode 100644 index 5a6b0ba8f2d6..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- capplets/desktop-links/Makefile.in.orig Tue Dec 30 15:55:28 2003 -+++ capplets/desktop-links/Makefile.in Tue Dec 30 15:55:49 2003 -@@ -190,7 +190,7 @@ - - pixmaps_pre = $(capplets:=-capplet.png) - pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png --pixmapsdir = $(datadir)/icons/gnome/48x48/apps -+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps - - desktop_files = $(capplets:=.desktop) - desktop_in_files = $(desktop_files:.desktop=.desktop.in) diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c new file mode 100644 index 000000000000..02374b23ac45 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c @@ -0,0 +1,33 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig Wed Jan 19 18:16:13 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c Wed Feb 9 21:33:00 2005 +@@ -242,21 +242,25 @@ + Bool allowMultipleSelection, + GladeXML * dialog) + { ++ gchar *utfGroupName, *titlemarkup; ++ GtkWidget *expander; ++ GtkWidget *vbox; ++ GtkWidget *align; + GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP); + + current1stLevelId = configItem->name; + +- gchar *utfGroupName = xci_desc_to_utf8 (configItem); +- gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); ++ utfGroupName = xci_desc_to_utf8 (configItem); ++ titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL); + +- GtkWidget *expander = gtk_expander_new (titlemarkup); ++ expander = gtk_expander_new (titlemarkup); + g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free); + + g_free (titlemarkup); + gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE); +- GtkWidget *align = gtk_alignment_new (0, 0, 1, 1); ++ align = gtk_alignment_new (0, 0, 1, 1); + gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0); +- GtkWidget *vbox = gtk_vbox_new (TRUE, 6); ++ vbox = gtk_vbox_new (TRUE, 6); + gtk_container_add (GTK_CONTAINER (align), vbox); + gtk_container_add (GTK_CONTAINER (expander), align); + currentVbox = vbox; diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c deleted file mode 100644 index 9c487d7b8e9d..000000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { -@@ -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); -- font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL); -+ font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL); - - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - if (cursor_font && ! strcmp (cursor_font, font_path)) { diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index f97758e10ba0..d8e861724bd3 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Feb 21 15:53:01 2005 -+++ configure Mon Feb 21 15:53:01 2005 -@@ -21286,6 +21286,7 @@ +--- configure.orig Thu Jan 13 02:39:28 2005 ++++ configure Thu Jan 13 02:39:28 2005 +@@ -22221,6 +22221,7 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8,7 +8,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -26646,7 +26647,7 @@ +@@ -27490,7 +27491,7 @@ cat >>confdefs.h <<_ACEOF diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in new file mode 100644 index 000000000000..52a627fb20df --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-settings-daemon/actions/Makefile.in.orig Mon Dec 20 19:19:31 2004 ++++ gnome-settings-daemon/actions/Makefile.in Mon Dec 20 19:20:45 2004 +@@ -296,7 +296,7 @@ + Datadir = $(datadir)/control-center-2.0/interfaces/ + Data_DATA = acme.glade + +-pixmapsdir = $(GNOMECC_PIXMAPS_DIR) ++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps + pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png + + EXTRA_DIST = \ diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 423c553037a3..8787f4495677 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -22,39 +22,36 @@ etc/gnome-vfs-2.0/modules/font-method.conf etc/gnome-vfs-2.0/modules/theme-method.conf include/gnome-window-settings-2.0/gnome-window-manager.h include/gnome-window-settings-2.0/gnome-wm-manager.h -lib/bonobo/libthemus-theme-properties-view.so lib/gnome-vfs-2.0/modules/libfont-method.so lib/gnome-vfs-2.0/modules/libtheme-method.so lib/libgnome-window-settings.a lib/libgnome-window-settings.so lib/libgnome-window-settings.so.1 +lib/nautilus/extensions-1.0/libnautilus-fontilus.so +lib/nautilus/extensions-1.0/libnautilus-themus.so lib/window-manager-settings/libmetacity.a lib/window-manager-settings/libmetacity.so libdata/bonobo/servers/GNOME_SettingsDaemon.server -libdata/bonobo/servers/Themus_Properties_View.server -libdata/bonobo/servers/fontilus.server libdata/pkgconfig/gnome-window-settings-2.0.pc -libexec/fontilus-context-menu libexec/gnome-settings-daemon -share/gnome/application-registry/fontilus.applications -share/gnome/application-registry/themus.applications +share/gnome/applications/accessibility-keyboard.desktop +share/gnome/applications/at-properties.desktop +share/gnome/applications/background.desktop +share/gnome/applications/default-applications.desktop +share/gnome/applications/display-properties.desktop +share/gnome/applications/font-properties.desktop share/gnome/applications/gnome-font-viewer.desktop +share/gnome/applications/gnome-network-preferences.desktop +share/gnome/applications/gnome-settings-mouse.desktop +share/gnome/applications/gnome-settings-sound.desktop +share/gnome/applications/gnome-ui-properties.desktop share/gnome/applications/gnomecc.desktop +share/gnome/applications/gtk-theme-selector.desktop +share/gnome/applications/keybinding.desktop +share/gnome/applications/keyboard.desktop +share/gnome/applications/themus-theme-applier.desktop +share/gnome/applications/window-properties.desktop @exec update-desktop-database > /dev/null || /usr/bin/true -share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop -share/gnome/control-center-2.0/capplets/at-properties.desktop -share/gnome/control-center-2.0/capplets/background.desktop -share/gnome/control-center-2.0/capplets/default-applications.desktop -share/gnome/control-center-2.0/capplets/display-properties.desktop -share/gnome/control-center-2.0/capplets/font-properties.desktop -share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop -share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop -share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop -share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop -share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop -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/window-properties.desktop share/gnome/control-center-2.0/icons/display-capplet.png share/gnome/control-center-2.0/interfaces/acme.glade share/gnome/control-center-2.0/interfaces/apply-font.glade @@ -69,6 +66,7 @@ share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade +share/gnome/control-center-2.0/interfaces/modmap-dialog.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 @@ -77,8 +75,6 @@ share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png -share/gnome/control-center-2.0/pixmaps/acme-brightness.png -share/gnome/control-center-2.0/pixmaps/acme-eject.png share/gnome/control-center-2.0/pixmaps/at-startup.png share/gnome/control-center-2.0/pixmaps/at-support.png share/gnome/control-center-2.0/pixmaps/bar-disabled.png @@ -88,8 +84,6 @@ share/gnome/control-center-2.0/pixmaps/bar.png share/gnome/control-center-2.0/pixmaps/double-click-maybe.png share/gnome/control-center-2.0/pixmaps/double-click-off.png share/gnome/control-center-2.0/pixmaps/double-click-on.png -share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png -share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png share/gnome/control-center-2.0/pixmaps/keyboard-bell.png share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png @@ -117,23 +111,16 @@ share/gnome/control-center-2.0/xrdb/Xaw.ad 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/mime-info/fontilus.keys -share/gnome/mime-info/fontilus.mime -share/gnome/mime-info/themus.keys -share/gnome/pixmaps/control-center2.png share/gnome/pixmaps/display-capplet.png -share/gnome/pixmaps/gnomecc-2/active.png -share/gnome/pixmaps/gnomecc-2/bcg_top.png -share/gnome/pixmaps/gnomecc-2/blank.png -share/gnome/pixmaps/gnomecc-2/title.png -share/gnome/vfolders/Accessibility.directory -share/gnome/vfolders/Advanced.directory share/gnome/vfolders/font-method.directory share/gnome/vfolders/theme-method.directory -share/icons/gnome/48x48/apps/accessibility-directory.png +share/icons/gnome/48x48/apps/acme-brightness.png +share/icons/gnome/48x48/apps/acme-eject.png +share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png +share/icons/gnome/48x48/apps/gnome-speakernotes.png +share/icons/hicolor/48x48/apps/gnome-control-center.png share/locale/af/LC_MESSAGES/control-center-2.0.mo share/locale/am/LC_MESSAGES/control-center-2.0.mo share/locale/ar/LC_MESSAGES/control-center-2.0.mo @@ -175,6 +162,7 @@ share/locale/ml/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/nb/LC_MESSAGES/control-center-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/control-center-2.0.mo @@ -200,17 +188,14 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo share/locale/zu/LC_MESSAGES/control-center-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true -@dirrm share/gnome/pixmaps/gnomecc-2 @dirrm share/gnome/gnome-background-properties @dirrm share/gnome/cursor-fonts @dirrm share/gnome/control-center-2.0/xrdb @dirrm share/gnome/control-center-2.0/pixmaps @dirrm share/gnome/control-center-2.0/interfaces -@dirrm share/gnome/control-center-2.0/icons +@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true @dirrm lib/window-manager-settings @dirrm include/gnome-window-settings-2.0 @unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 224e9f1a5756..7650bd4087ab 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomesystemmonitor -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.8 +MASTER_SITE_SUBDIR= sources/gnome-system-monitor/2.10 DISTNAME= gnome-system-monitor-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 73b0b9a93148..7919d4274b50 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 3d4564b2d0b49a5826ae212b23d234df -SIZE (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 690661 +MD5 (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 6dc606f13600e49a52b669fb97e789e0 +SIZE (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 752223 diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c index 30ef6303d397..49a699641476 100644 --- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c +++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c @@ -1,28 +1,7 @@ ---- src/proctable.c.orig Sun Nov 21 18:03:12 2004 -+++ src/proctable.c Mon Dec 6 22:10:55 2004 -@@ -535,6 +535,9 @@ - glibtop_get_proc_uid (&procuid, pid); - glibtop_get_proc_time (&proctime, pid); - newcputime = proctime.utime + proctime.stime; -+ if (proctime.frequency) { -+ newcputime /= (proctime.frequency/100); -+ } - model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); +--- src/proctable.c.orig Tue Nov 30 01:28:31 2004 ++++ src/proctable.c Wed Dec 1 13:25:55 2004 +@@ -772,6 +772,12 @@ - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), -@@ -645,6 +648,10 @@ - glibtop_get_proc_uid (&procuid, pid); - glibtop_get_proc_time (&proctime, pid); - newcputime = proctime.utime + proctime.stime; -+ if (proctime.frequency) { -+ newcputime /= (proctime.frequency/100); -+ } -+ - - wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()), - pid, -@@ -745,6 +752,12 @@ - } +static int @@ -32,18 +11,15 @@ +} + static void - refresh_list (ProcData *data, const unsigned *pid_list, guint n) + refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n) { -@@ -754,6 +767,8 @@ - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree)); - guint i; +@@ -863,10 +869,15 @@ + + pid_list = glibtop_get_proclist (&proclist, which, arg); -+ qsort (pid_list, n, sizeof (*pid_list), pid_compare); ++ qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare); + - /* Add or update processes */ - for(i = 0; i < n; ++i) { - ProcInfo *info; -@@ -837,6 +852,9 @@ + /* FIXME: total cpu time elapsed should be calculated on an individual basis here ** should probably have a total_time_last gint in the ProcInfo structure */ glibtop_get_cpu (&cpu); total_time = cpu.total - total_time_last; diff --git a/sysutils/gnomesystemmonitor/files/patch-src_interface.c b/sysutils/gnomesystemmonitor/files/patch-src_interface.c new file mode 100644 index 000000000000..1b4276e7ee56 --- /dev/null +++ b/sysutils/gnomesystemmonitor/files/patch-src_interface.c @@ -0,0 +1,21 @@ +--- src/interface.c.orig Wed Dec 1 13:23:26 2004 ++++ src/interface.c Wed Dec 1 13:24:00 2004 +@@ -529,12 +529,12 @@ + + model = gtk_tree_store_new (10, + GDK_TYPE_PIXBUF, +- G_TYPE_STRING, // device name +- G_TYPE_STRING, // directory +- G_TYPE_STRING, // type +- G_TYPE_STRING, // total +- G_TYPE_STRING, // free +- G_TYPE_STRING, // used ++ G_TYPE_STRING, /* device name */ ++ G_TYPE_STRING, /* directory */ ++ G_TYPE_STRING, /* type */ ++ G_TYPE_STRING, /* total */ ++ G_TYPE_STRING, /* free */ ++ G_TYPE_STRING, /* used */ + G_TYPE_FLOAT, + G_TYPE_FLOAT, + G_TYPE_FLOAT); diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c new file mode 100644 index 000000000000..efdcef5f7882 --- /dev/null +++ b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c @@ -0,0 +1,32 @@ +--- src/openfiles.c.orig Fri Jan 21 18:35:43 2005 ++++ src/openfiles.c Tue Jan 25 19:02:29 2005 +@@ -8,6 +8,7 @@ + #include <netdb.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <netinet/in.h> + #include <arpa/inet.h> + #include "procman.h" + #include "openfiles.h" +@@ -143,7 +144,7 @@ + const glibtop_open_files_entry *o2 = b; + + /* Falta manejar los diferentes tipos! */ +- return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX! ++ return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */ + } + + +@@ -152,10 +153,10 @@ + { + ProcInfo *info; + GtkTreeModel *model; +- glibtop_open_files_entry *openfiles; +- glibtop_proc_open_files procmap; + GHashTable *new_maps; + gint i; ++ glibtop_open_files_entry *openfiles; ++ glibtop_proc_open_files procmap; + + info = g_object_get_data (G_OBJECT (tree), "selected_info"); + g_return_if_fail (info); diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c deleted file mode 100644 index 288ccc26adc0..000000000000 --- a/sysutils/gnomesystemmonitor/files/patch-src_util.c +++ /dev/null @@ -1,34 +0,0 @@ ---- src/util.c.orig Fri Dec 12 02:26:57 2003 -+++ src/util.c Fri Dec 12 02:35:38 2003 -@@ -16,6 +16,7 @@ - - #ifdef __FreeBSD__ - # include <errno.h> -+# include <termios.h> - # include <libutil.h> - #endif - -@@ -181,7 +182,11 @@ - * Make su think we're sending the password from a terminal: - */ - -+#ifndef __FreeBSD__ - if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) { -+#else -+ if ((t_fd = OPEN_TTY()) < 0) { -+#endif - fprintf (stderr, "Unable to open a terminal\n"); - ABORT (root); - } -@@ -259,7 +264,11 @@ - } - } - -+#ifndef __FreeBSD__ - if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { -+#else -+ if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) { -+#endif - perror ("Unable to open pseudo slave terminal"); - _exit (-1); - } diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index b0fa0b688925..9d8082a83d19 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -16,7 +16,6 @@ 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 -share/gnome/pixmaps/procman.png share/locale/am/LC_MESSAGES/gnome-system-monitor.mo share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo share/locale/az/LC_MESSAGES/gnome-system-monitor.mo @@ -33,6 +32,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo share/locale/es/LC_MESSAGES/gnome-system-monitor.mo +share/locale/et/LC_MESSAGES/gnome-system-monitor.mo share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo @@ -56,6 +56,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo +share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo share/locale/no/LC_MESSAGES/gnome-system-monitor.mo share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo @@ -71,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo +share/locale/th/LC_MESSAGES/gnome-system-monitor.mo share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile index f1ce787bb4c6..1dca8a647c5c 100644 --- a/sysutils/gnomesystemtools/Makefile +++ b/sysutils/gnomesystemtools/Makefile @@ -6,23 +6,27 @@ # PORTNAME= gnomesystemtools -PORTVERSION= 1.0.2 +PORTVERSION= 1.2.0 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.0 +MASTER_SITE_SUBDIR= sources/gnome-system-tools/1.2 DISTNAME= gnome-system-tools-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Tools to configure workstations +BUILD_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends +RUN_DEPENDS= ${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends + USE_BZIP2= yes USE_GMAKE= yes -USE_PERL5= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes -USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomehack gnomeprefix gnometarget intlhack nautilus2 USE_LIBTOOL_VER=15 +INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -30,17 +34,11 @@ GCONF_SCHEMAS= gnome-system-tools.schemas .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 +.if ${OSVERSION} >= 500000 CONFIGURE_ARGS+= --enable-services PLIST_SUB+= SERVICES="" .else PLIST_SUB+= SERVICES="@comment " .endif -.if ${PERL_LEVEL} < 500600 -post-configure: - @${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \ - ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g' -.endif - .include <bsd.port.post.mk> diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo index 6b2fb5abceac..6eb37fa99a84 100644 --- a/sysutils/gnomesystemtools/distinfo +++ b/sysutils/gnomesystemtools/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 674611d3fb195fde940223821cfa6dda -SIZE (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 2766787 +MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e +SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677 diff --git a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in deleted file mode 100644 index 7f7cce28ee37..000000000000 --- a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in +++ /dev/null @@ -1,34 +0,0 @@ ---- backends/replace.pl.in.orig Fri Oct 22 02:41:56 2004 -+++ backends/replace.pl.in Fri Oct 22 02:42:48 2004 -@@ -1113,19 +1113,19 @@ - - return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface)); - -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - $line_no ++; - - while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1) - { -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - $line_no ++; - } - - $line_no = 0; - if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface)) - { -- delete $$buff[$line_no]; -+ splice @{$buff},$line_no,1; - } - - &gst_file_buffer_clean ($buff); -@@ -1663,7 +1663,7 @@ - } - else - { -- delete $$buff[$i]; -+ splice @{$buff},$i,1; - } - } - } diff --git a/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in b/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in deleted file mode 100644 index 16861791c1ca..000000000000 --- a/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in +++ /dev/null @@ -1,10 +0,0 @@ ---- backends/service-list.pl.in.orig Sun Sep 19 13:20:02 2004 -+++ backends/service-list.pl.in Sun Sep 19 13:20:10 2004 -@@ -225,6 +225,7 @@ - "atm3\.sh", - "ccd", - "cleanvar", -+ "cleartmp", - "devdb", - "devfs", - "dhclient", diff --git a/sysutils/gnomesystemtools/files/patch-configure b/sysutils/gnomesystemtools/files/patch-configure index b854cde3a70f..712bb1defc9f 100644 --- a/sysutils/gnomesystemtools/files/patch-configure +++ b/sysutils/gnomesystemtools/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Wed May 26 12:02:51 2004 -+++ configure Wed May 26 12:03:23 2004 -@@ -22623,7 +22623,7 @@ +--- configure.orig Thu Jan 13 17:15:39 2005 ++++ configure Thu Jan 13 17:17:13 2005 +@@ -22990,7 +22990,7 @@ GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS" GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a" diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c new file mode 100644 index 000000000000..9272d918136c --- /dev/null +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c @@ -0,0 +1,18 @@ +--- src/common/gst-auth.c.orig Thu Mar 10 14:39:18 2005 ++++ src/common/gst-auth.c Thu Mar 10 14:39:50 2005 +@@ -142,12 +142,12 @@ gst_auth_run_term (GstTool *tool, gchar + unsetenv("LANG"); + unsetenv("LANGUAGE"); + +- dup2 (p[1], 1); +- dup2 (p[1], 2); ++ dup2 (p[1], STDOUT_FILENO); ++ /*dup2 (p[1], 2);*/ + close (p[0]); + + execv (args[0], args); +- exit (255); ++ _exit (255); + } else { + #ifndef __FreeBSD__ + /* Linux's su works ok with echo disabling */ diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c new file mode 100644 index 000000000000..5134f30e581b --- /dev/null +++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c @@ -0,0 +1,11 @@ +--- src/common/gst-tool.c.orig Thu Mar 10 14:39:54 2005 ++++ src/common/gst-tool.c Thu Mar 10 14:40:00 2005 +@@ -1653,7 +1653,7 @@ poll_backend (GstTool *tool) + struct pollfd fd; + + fd.fd = tool->read_fd; +- fd.events = POLLIN || POLLPRI; ++ fd.events = POLLIN | POLLPRI; + + while (poll (&fd, 1, 100) <= 0) { + while (gtk_events_pending ()) diff --git a/sysutils/gnomesystemtools/files/patch-src_network_location.c b/sysutils/gnomesystemtools/files/patch-src_network_location.c new file mode 100644 index 000000000000..e2577a6a49e0 --- /dev/null +++ b/sysutils/gnomesystemtools/files/patch-src_network_location.c @@ -0,0 +1,11 @@ +--- src/network/location.c.orig Thu Dec 23 13:16:33 2004 ++++ src/network/location.c Thu Dec 23 13:16:40 2004 +@@ -687,7 +687,7 @@ + static void + copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[]) + { +- gchar **string = (gchar **) list;; ++ gchar **string = (gchar **) list; + gchar *value; + + while (*string) diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist index 6a980fb7574e..a52125a51fcd 100644 --- a/sysutils/gnomesystemtools/pkg-plist +++ b/sysutils/gnomesystemtools/pkg-plist @@ -1,24 +1,23 @@ bin/network-admin %%SERVICES%%bin/services-admin +bin/shares-admin bin/time-admin bin/users-admin -etc/X11/sysconfig/network.desktop -%%SERVICES%%etc/X11/sysconfig/services.desktop -etc/X11/sysconfig/time.desktop -etc/X11/sysconfig/users.desktop +lib/nautilus/extensions-1.0/libnautilus-gst-shares.so libdata/pkgconfig/gnome-system-tools.pc -libdata/pkgconfig/system-tools-backends.pc share/gnome-system-tools/interfaces/boot.glade share/gnome-system-tools/interfaces/common.glade share/gnome-system-tools/interfaces/disks.glade share/gnome-system-tools/interfaces/network.glade share/gnome-system-tools/interfaces/services.glade +share/gnome-system-tools/interfaces/shares.glade share/gnome-system-tools/interfaces/time.glade share/gnome-system-tools/interfaces/users.glade share/gnome-system-tools/pixmaps/16_ethernet.xpm share/gnome-system-tools/pixmaps/16_loopback.xpm share/gnome-system-tools/pixmaps/16_plip.xpm share/gnome-system-tools/pixmaps/16_ppp.xpm +share/gnome-system-tools/pixmaps/archlinux.png share/gnome-system-tools/pixmaps/black_panther.png share/gnome-system-tools/pixmaps/boot.png share/gnome-system-tools/pixmaps/computer.png @@ -26,6 +25,7 @@ share/gnome-system-tools/pixmaps/conectiva.png share/gnome-system-tools/pixmaps/connection-ethernet.png share/gnome-system-tools/pixmaps/connection-modem.png share/gnome-system-tools/pixmaps/debian.png +share/gnome-system-tools/pixmaps/disks.png share/gnome-system-tools/pixmaps/fedora.png share/gnome-system-tools/pixmaps/freebsd.png share/gnome-system-tools/pixmaps/gentoo.png @@ -47,6 +47,7 @@ share/gnome-system-tools/pixmaps/redhat.png share/gnome-system-tools/pixmaps/server.png share/gnome-system-tools/pixmaps/services.png share/gnome-system-tools/pixmaps/settings.png +share/gnome-system-tools/pixmaps/shares.png share/gnome-system-tools/pixmaps/slackware.png share/gnome-system-tools/pixmaps/specifix.png share/gnome-system-tools/pixmaps/suse.png @@ -63,6 +64,7 @@ share/gnome-system-tools/pixmaps/wavelan-48.png share/gnome-system-tools/pixmaps/world_map-960.png share/gnome/applications/network.desktop %%SERVICES%%share/gnome/applications/services.desktop +share/gnome/applications/shares.desktop share/gnome/applications/time.desktop share/gnome/applications/users.desktop share/gnome/help/boot-admin/C/boot-admin.xml @@ -90,145 +92,59 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf share/gnome/omf/gnome-system-tools/users-admin-C.omf share/locale/am/LC_MESSAGES/gnome-system-tools.mo share/locale/ar/LC_MESSAGES/gnome-system-tools.mo -share/locale/ar/LC_MESSAGES/setup-tools-backends.mo share/locale/az/LC_MESSAGES/gnome-system-tools.mo -share/locale/az/LC_MESSAGES/setup-tools-backends.mo share/locale/bg/LC_MESSAGES/gnome-system-tools.mo -share/locale/bg/LC_MESSAGES/setup-tools-backends.mo -share/locale/bn/LC_MESSAGES/setup-tools-backends.mo share/locale/bn/LC_MESSAGES/gnome-system-tools.mo -share/locale/bs/LC_MESSAGES/setup-tools-backends.mo share/locale/ca/LC_MESSAGES/gnome-system-tools.mo -share/locale/ca/LC_MESSAGES/setup-tools-backends.mo share/locale/cs/LC_MESSAGES/gnome-system-tools.mo -share/locale/cs/LC_MESSAGES/setup-tools-backends.mo share/locale/da/LC_MESSAGES/gnome-system-tools.mo -share/locale/da/LC_MESSAGES/setup-tools-backends.mo share/locale/de/LC_MESSAGES/gnome-system-tools.mo -share/locale/de/LC_MESSAGES/setup-tools-backends.mo share/locale/el/LC_MESSAGES/gnome-system-tools.mo -share/locale/el/LC_MESSAGES/setup-tools-backends.mo share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo -share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo share/locale/es/LC_MESSAGES/gnome-system-tools.mo -share/locale/es/LC_MESSAGES/setup-tools-backends.mo share/locale/et/LC_MESSAGES/gnome-system-tools.mo share/locale/eu/LC_MESSAGES/gnome-system-tools.mo -share/locale/eu/LC_MESSAGES/setup-tools-backends.mo share/locale/fi/LC_MESSAGES/gnome-system-tools.mo -share/locale/fi/LC_MESSAGES/setup-tools-backends.mo share/locale/fr/LC_MESSAGES/gnome-system-tools.mo -share/locale/fr/LC_MESSAGES/setup-tools-backends.mo share/locale/ga/LC_MESSAGES/gnome-system-tools.mo share/locale/gl/LC_MESSAGES/gnome-system-tools.mo -share/locale/gu/LC_MESSAGES/setup-tools-backends.mo share/locale/gu/LC_MESSAGES/gnome-system-tools.mo +share/locale/hi/LC_MESSAGES/gnome-system-tools.mo share/locale/hr/LC_MESSAGES/gnome-system-tools.mo -share/locale/hr/LC_MESSAGES/setup-tools-backends.mo share/locale/hu/LC_MESSAGES/gnome-system-tools.mo share/locale/id/LC_MESSAGES/gnome-system-tools.mo -share/locale/id/LC_MESSAGES/setup-tools-backends.mo share/locale/it/LC_MESSAGES/gnome-system-tools.mo -share/locale/it/LC_MESSAGES/setup-tools-backends.mo share/locale/ja/LC_MESSAGES/gnome-system-tools.mo -share/locale/ja/LC_MESSAGES/setup-tools-backends.mo share/locale/ko/LC_MESSAGES/gnome-system-tools.mo -share/locale/ko/LC_MESSAGES/setup-tools-backends.mo share/locale/lt/LC_MESSAGES/gnome-system-tools.mo -share/locale/lt/LC_MESSAGES/setup-tools-backends.mo share/locale/lv/LC_MESSAGES/gnome-system-tools.mo share/locale/mk/LC_MESSAGES/gnome-system-tools.mo share/locale/ml/LC_MESSAGES/gnome-system-tools.mo share/locale/mn/LC_MESSAGES/gnome-system-tools.mo share/locale/ms/LC_MESSAGES/gnome-system-tools.mo -share/locale/ms/LC_MESSAGES/setup-tools-backends.mo -share/locale/nb/LC_MESSAGES/gnome-system-tools.mo -share/locale/nb/LC_MESSAGES/setup-tools-backends.mo share/locale/nl/LC_MESSAGES/gnome-system-tools.mo -share/locale/nl/LC_MESSAGES/setup-tools-backends.mo share/locale/nn/LC_MESSAGES/gnome-system-tools.mo share/locale/no/LC_MESSAGES/gnome-system-tools.mo -share/locale/no/LC_MESSAGES/setup-tools-backends.mo -share/locale/pa/LC_MESSAGES/setup-tools-backends.mo share/locale/pa/LC_MESSAGES/gnome-system-tools.mo share/locale/pl/LC_MESSAGES/gnome-system-tools.mo -share/locale/pl/LC_MESSAGES/setup-tools-backends.mo share/locale/pt/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt/LC_MESSAGES/setup-tools-backends.mo share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo -share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo share/locale/ro/LC_MESSAGES/gnome-system-tools.mo -share/locale/ro/LC_MESSAGES/setup-tools-backends.mo share/locale/ru/LC_MESSAGES/gnome-system-tools.mo share/locale/sk/LC_MESSAGES/gnome-system-tools.mo share/locale/sq/LC_MESSAGES/gnome-system-tools.mo -share/locale/sq/LC_MESSAGES/setup-tools-backends.mo share/locale/sr/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr/LC_MESSAGES/setup-tools-backends.mo share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo -share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo share/locale/sv/LC_MESSAGES/gnome-system-tools.mo -share/locale/sv/LC_MESSAGES/setup-tools-backends.mo share/locale/ta/LC_MESSAGES/gnome-system-tools.mo -share/locale/ta/LC_MESSAGES/setup-tools-backends.mo +share/locale/th/LC_MESSAGES/gnome-system-tools.mo share/locale/tr/LC_MESSAGES/gnome-system-tools.mo share/locale/uk/LC_MESSAGES/gnome-system-tools.mo -share/locale/uk/LC_MESSAGES/setup-tools-backends.mo share/locale/vi/LC_MESSAGES/gnome-system-tools.mo share/locale/wa/LC_MESSAGES/gnome-system-tools.mo share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo -share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo -share/setup-tool-backends/files/debian_ipchains -share/setup-tool-backends/scripts/boot-conf -share/setup-tool-backends/scripts/boot-grub.pl -share/setup-tool-backends/scripts/boot-lilo.pl -share/setup-tool-backends/scripts/boot-yaboot.pl -share/setup-tool-backends/scripts/boot.pl -share/setup-tool-backends/scripts/debug.pl -share/setup-tool-backends/scripts/dhcpd-conf -share/setup-tool-backends/scripts/dhcpd.pl -share/setup-tool-backends/scripts/disks-conf -share/setup-tool-backends/scripts/display-conf -share/setup-tool-backends/scripts/file.pl -share/setup-tool-backends/scripts/filesys.pl -share/setup-tool-backends/scripts/font-conf -share/setup-tool-backends/scripts/font.pl -share/setup-tool-backends/scripts/general.pl -share/setup-tool-backends/scripts/guess_system.sh -share/setup-tool-backends/scripts/internetsharing-conf -share/setup-tool-backends/scripts/ishare.pl -share/setup-tool-backends/scripts/media.pl -share/setup-tool-backends/scripts/memory-conf -share/setup-tool-backends/scripts/mouse-conf -share/setup-tool-backends/scripts/network-conf -share/setup-tool-backends/scripts/network.pl -share/setup-tool-backends/scripts/package-conf -share/setup-tool-backends/scripts/parse.pl -share/setup-tool-backends/scripts/partition.pl -share/setup-tool-backends/scripts/platform.pl -share/setup-tool-backends/scripts/print-conf -share/setup-tool-backends/scripts/print.pl -share/setup-tool-backends/scripts/replace.pl -share/setup-tool-backends/scripts/report.pl -share/setup-tool-backends/scripts/service-list.pl -share/setup-tool-backends/scripts/service.pl -share/setup-tool-backends/scripts/services-conf -share/setup-tool-backends/scripts/share.pl -share/setup-tool-backends/scripts/shares-conf -share/setup-tool-backends/scripts/time-conf -share/setup-tool-backends/scripts/tokenizer.pl -share/setup-tool-backends/scripts/type1inst -share/setup-tool-backends/scripts/users-conf -share/setup-tool-backends/scripts/util.pl -share/setup-tool-backends/scripts/x.pl -share/setup-tool-backends/scripts/xml.pl -@dirrm share/setup-tool-backends/scripts -@dirrm share/setup-tool-backends/files -@dirrm share/setup-tool-backends @dirrm share/gnome/omf/gnome-system-tools @dirrm share/gnome/help/users-admin/C/figures @dirrm share/gnome/help/users-admin/C diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index f8eeb746a317..88badb5387fe 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -6,10 +6,10 @@ # PORTNAME= nautilus-cd-burner -PORTVERSION= 2.8.7 +PORTVERSION= 2.10.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo index 723521ada8e0..960dd8c03871 100644 --- a/sysutils/nautilus-cd-burner/distinfo +++ b/sysutils/nautilus-cd-burner/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = b5b4b0074e5fa73d8e79a5cb221e0ca4 -SIZE (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = 561727 +MD5 (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = eba87e8b043cbd0a94d3371aa869bcf1 +SIZE (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = 623320 diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c deleted file mode 100644 index a684ac82a0de..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c +++ /dev/null @@ -1,15 +0,0 @@ ---- bacon-cd-selection.c.orig Thu Nov 4 00:25:43 2004 -+++ bacon-cd-selection.c Thu Nov 4 00:25:57 2004 -@@ -177,10 +177,10 @@ - static void - bacon_cd_selection_init (BaconCdSelection *bcs) - { -- bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -- - GtkCellRenderer *cell; - GtkListStore *store; -+ bcs->priv = g_new0 (BaconCdSelectionPrivate, 1); -+ - - store = gtk_list_store_new (1, G_TYPE_STRING); - gtk_combo_box_set_model (GTK_COMBO_BOX (bcs), diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c deleted file mode 100644 index 87cd0836b813..000000000000 --- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c +++ /dev/null @@ -1,18 +0,0 @@ ---- make-iso.c.orig Fri Dec 19 13:06:34 2003 -+++ make-iso.c Mon Dec 29 16:18:15 2003 -@@ -571,6 +571,7 @@ - argv[i++] = "-r"; - if (use_joliet) { - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - argv[i++] = "-q"; - argv[i++] = "-graft-points"; -@@ -650,6 +651,7 @@ - argv[i++] = "-r"; - if (use_joliet) { - argv[i++] = "-J"; -+ argv[i++] = "-joliet-long"; - } - argv[i++] = "-graft-points"; - argv[i++] = "-path-list"; diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c index c666b1c2923c..c2299e5721cb 100644 --- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c @@ -1,6 +1,29 @@ ---- cd-drive.c.orig Thu Feb 10 14:39:59 2005 -+++ cd-drive.c Tue Feb 15 03:34:40 2005 -@@ -261,9 +261,21 @@ +--- nautilus-burn-drive.c.orig Tue Feb 22 19:34:17 2005 ++++ nautilus-burn-drive.c Tue Mar 1 00:46:50 2005 +@@ -62,6 +62,13 @@ + + #define CD_ROM_SPEED 176 + ++#if !defined(__linux) ++static int get_device_max_read_speed (char *device); ++#endif ++#if defined(__linux__) || defined(__FreeBSD__) ++static int get_device_max_write_speed (char *device); ++#endif ++ + static struct { + const char *name; + gboolean can_write_cdr; +@@ -149,7 +156,7 @@ + int *max_wr_speed, + NautilusBurnDriveType *type) + { +- char *stdout_data, *rd_speed, *wr_speed, *drive_cap; ++ char *stdout_data, *drive_cap; + + *max_rd_speed = -1; + *max_wr_speed = -1; +@@ -278,6 +285,9 @@ { int fd; int mmc_profile; @@ -8,12 +31,16 @@ + struct cam_device *cam; +#endif - g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR); + g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_TYPE_ERROR); + +@@ -286,6 +296,15 @@ + if (has_data) *has_data = FALSE; + if (has_audio) *has_audio = FALSE; +#ifdef __FreeBSD__ + cam = cam_open_device (device, O_RDWR); + if (cam == NULL) { -+ return CD_MEDIA_TYPE_ERROR; ++ return NAUTILUS_BURN_MEDIA_TYPE_ERROR; + } + + fd = cam->fd; @@ -22,15 +49,45 @@ if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { if (errno == EBUSY) { -@@ -271,6 +283,7 @@ +@@ -293,6 +312,7 @@ } - return CD_MEDIA_TYPE_ERROR; + return NAUTILUS_BURN_MEDIA_TYPE_ERROR; } +#endif mmc_profile = get_mmc_profile (fd); -@@ -298,7 +311,11 @@ +@@ -303,12 +323,20 @@ + opened = nautilus_burn_drive_door_open (mmc_profile, fd); + + if (opened != FALSE) { ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else + close (fd); ++#endif + return NAUTILUS_BURN_MEDIA_TYPE_ERROR; + } else { + int blank, rewrite, empty; + if (get_disc_status (fd, &empty, &rewrite, &blank) == 0) { ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else + close (fd); ++#endif + + if (is_rewritable) + *is_rewritable = rewrite; +@@ -325,12 +353,20 @@ + else + return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN; + } ++#ifdef __FreeBSD__ ++ cam_close_device (cam); ++#else + close (fd); ++#endif + return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN; } } @@ -40,40 +97,40 @@ close (fd); +#endif - switch (mmc_profile) { - case -1: -@@ -433,10 +450,21 @@ - int secs; - int mmc_profile; + if (is_blank) + *is_blank = mmc_profile & 0x10000; +@@ -569,11 +605,21 @@ + int secs; + int mmc_profile; gint64 size; +#ifdef __FreeBSD__ + struct cam_device *cam; +#endif - g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN); + g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN); secs = 0; +#ifdef __FreeBSD__ + cam = cam_open_device (device, O_RDWR); + if (cam == NULL) { -+ return CD_MEDIA_SIZE_UNKNOWN; ++ return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN; + } -+ + + fd = cam->fd; +#else - if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0 && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) { -@@ -445,6 +473,7 @@ + if (errno == EBUSY) { +@@ -581,6 +627,7 @@ } - return CD_MEDIA_SIZE_UNKNOWN; + return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN; } +#endif mmc_profile = get_mmc_profile (fd); -@@ -467,7 +496,11 @@ - size = CD_MEDIA_SIZE_NA; +@@ -603,7 +650,11 @@ + size = NAUTILUS_BURN_MEDIA_SIZE_NA; } +#ifdef __FreeBSD__ @@ -84,7 +141,7 @@ return size; } -@@ -586,9 +619,81 @@ +@@ -896,9 +947,81 @@ #endif /* USE_HAL */ #if defined(__linux__) || defined(__FreeBSD__) @@ -113,7 +170,7 @@ + return -1; + } +#endif - ++ + get_read_write_speed (fd, &read_speed, &write_speed); +#ifdef __FreeBSD__ + cam_close_device (cam); @@ -121,7 +178,7 @@ + close (fd); +#endif + max_speed = (int)floor (write_speed) / CD_ROM_SPEED; - ++ + return max_speed; +} @@ -135,23 +192,23 @@ +#ifdef __FreeBSD__ + struct cam_device *cam; +#endif -+ + + max_speed = -1; +#ifdef __FreeBSD__ + cam = cam_open_device (device, O_RDWR); + if (cam == NULL) { + return -1; + } -+ ++ + fd = cam->fd; +#else -+ ++ + fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK); + if (fd < 0) { + return -1; + } +#endif -+ + + get_read_write_speed (fd, &read_speed, &write_speed); +#ifdef __FreeBSD__ + cam_close_device (cam); @@ -159,14 +216,14 @@ + close (fd); +#endif + max_speed = (int)floor (read_speed) / CD_ROM_SPEED; -+ ++ + return max_speed; +} +#endif #endif /* __linux__ || __FreeBSD__ */ #if defined (__linux__) -@@ -791,50 +896,6 @@ +@@ -1111,50 +1234,6 @@ } } return NULL; diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c index 3b8b07293043..c545be7d5513 100644 --- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c +++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c @@ -1,18 +1,18 @@ ---- nautilus-cd-burner.c.orig Sun Sep 19 18:44:15 2004 -+++ nautilus-cd-burner.c Sun Oct 31 13:06:08 2004 -@@ -21,6 +21,8 @@ - - Authors: Alexander Larsson <alexl@redhat.com> - */ +--- nautilus-cd-burner.c.orig Mon Feb 28 19:40:05 2005 ++++ nautilus-cd-burner.c Mon Feb 28 20:05:56 2005 +@@ -23,6 +23,8 @@ + * Bastien Nocera <hadess@hadess.net> + */ + +#include <sys/types.h> +#include <sys/stat.h> #include <gtk/gtk.h> #include <gtk/gtkfilesel.h> #include <gtk/gtkseparatormenuitem.h> -@@ -632,8 +634,19 @@ +@@ -843,8 +845,19 @@ } - if (res == RESULT_RETRY) { + if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) { - g_free (filename); - filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL); + gchar *path1; diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist index c73c94fd94d0..3c9bbef70ddb 100644 --- a/sysutils/nautilus-cd-burner/pkg-plist +++ b/sysutils/nautilus-cd-burner/pkg-plist @@ -1,12 +1,12 @@ bin/nautilus-cd-burner etc/gnome-vfs-2.0/modules/mapping-modules.conf -include/libnautilus-burn/bacon-cd-selection.h -include/libnautilus-burn/cd-drive.h -include/libnautilus-burn/cd-recorder.h +include/libnautilus-burn/nautilus-burn-drive-selection.h +include/libnautilus-burn/nautilus-burn-drive.h +include/libnautilus-burn/nautilus-burn-recorder.h lib/gnome-vfs-2.0/modules/libmapping.so lib/libnautilus-burn.a lib/libnautilus-burn.so -lib/libnautilus-burn.so.0 +lib/libnautilus-burn.so.1 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so libdata/pkgconfig/libnautilus-burn.pc libexec/mapping-daemon @@ -53,10 +53,12 @@ share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo @@ -71,6 +73,7 @@ share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo +share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile new file mode 100644 index 000000000000..d4133bcff47f --- /dev/null +++ b/sysutils/system-tools-backends/Makefile @@ -0,0 +1,45 @@ +# New ports collection makefile for: system-tools-backends +# Date created: 11 February 2005 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= system-tools-backends +PORTVERSION= 1.2.0 +CATEGORIES= sysutils gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Backend system admin scripts for gnome-system-tools + +USE_BZIP2= yes +USE_GMAKE= yes +USE_PERL5= yes +PREFIX?= ${X11BASE} +USE_GNOME= gnomehack gnometarget intlhack +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 +MTREE_FILE= /etc/mtree/BSD.x11.dist +.else +MTREE_FILE= /etc/mtree/BSD.x11-4.dist +.endif + +.if ${PERL_LEVEL} <= 500800 +RUN_DEPENDS+= ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp +.endif + +.if ${PERL_LEVEL} < 500600 +post-configure: + @${FIND} ${WRKSRC} \( -name "*.pl" -or -name "*-conf" \) | \ + ${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g' +.endif + +.include <bsd.port.post.mk> diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo new file mode 100644 index 000000000000..1fd288819b40 --- /dev/null +++ b/sysutils/system-tools-backends/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/system-tools-backends-1.2.0.tar.bz2) = 96b00eb0f800c1b5346be2f71d4dc3b2 +SIZE (gnome2/system-tools-backends-1.2.0.tar.bz2) = 532611 diff --git a/sysutils/system-tools-backends/files/patch-replace.pl.in b/sysutils/system-tools-backends/files/patch-replace.pl.in new file mode 100644 index 000000000000..9487b290dd52 --- /dev/null +++ b/sysutils/system-tools-backends/files/patch-replace.pl.in @@ -0,0 +1,29 @@ +--- replace.pl.in.orig Tue Dec 21 11:17:14 2004 ++++ replace.pl.in Thu Dec 23 13:14:41 2004 +@@ -1128,7 +1128,7 @@ + + while ($line_no < $line_end) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no++; + } + +@@ -1140,7 +1140,7 @@ + + while ($line_no < $line_end) + { +- delete $$buff[$line_no]; ++ splice @{$buff},$line_no,1; + $line_no++; + } + } +@@ -1680,7 +1680,7 @@ + } + else + { +- delete $$buff[$i]; ++ splice @{$buff},$i,1; + } + } + } diff --git a/sysutils/gnome-system-tools/files/patch-backends_service-list.pl.in b/sysutils/system-tools-backends/files/patch-service-list.pl.in index 16861791c1ca..8020a0e52c1e 100644 --- a/sysutils/gnome-system-tools/files/patch-backends_service-list.pl.in +++ b/sysutils/system-tools-backends/files/patch-service-list.pl.in @@ -1,5 +1,5 @@ ---- backends/service-list.pl.in.orig Sun Sep 19 13:20:02 2004 -+++ backends/service-list.pl.in Sun Sep 19 13:20:10 2004 +--- service-list.pl.in.orig Sun Sep 19 13:20:02 2004 ++++ service-list.pl.in Sun Sep 19 13:20:10 2004 @@ -225,6 +225,7 @@ "atm3\.sh", "ccd", diff --git a/sysutils/system-tools-backends/pkg-descr b/sysutils/system-tools-backends/pkg-descr new file mode 100644 index 000000000000..c92b12768beb --- /dev/null +++ b/sysutils/system-tools-backends/pkg-descr @@ -0,0 +1,4 @@ +System-tools-backends is a collection of scripts (mostly Perl) used by +gnome-sytem-tools to perform system administration tasks. + +WWW: http://www.gnome.org/projects/gst/ diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist new file mode 100644 index 000000000000..da943e8f93fd --- /dev/null +++ b/sysutils/system-tools-backends/pkg-plist @@ -0,0 +1,96 @@ +libdata/pkgconfig/system-tools-backends.pc +share/aclocal/system-tools-backends.m4 +share/locale/ar/LC_MESSAGES/setup-tools-backends.mo +share/locale/az/LC_MESSAGES/setup-tools-backends.mo +share/locale/bg/LC_MESSAGES/setup-tools-backends.mo +share/locale/bn/LC_MESSAGES/setup-tools-backends.mo +share/locale/bs/LC_MESSAGES/setup-tools-backends.mo +share/locale/ca/LC_MESSAGES/setup-tools-backends.mo +share/locale/cs/LC_MESSAGES/setup-tools-backends.mo +share/locale/da/LC_MESSAGES/setup-tools-backends.mo +share/locale/de/LC_MESSAGES/setup-tools-backends.mo +share/locale/el/LC_MESSAGES/setup-tools-backends.mo +share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo +share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo +share/locale/es/LC_MESSAGES/setup-tools-backends.mo +share/locale/eu/LC_MESSAGES/setup-tools-backends.mo +share/locale/fi/LC_MESSAGES/setup-tools-backends.mo +share/locale/fr/LC_MESSAGES/setup-tools-backends.mo +share/locale/gu/LC_MESSAGES/setup-tools-backends.mo +share/locale/hi/LC_MESSAGES/setup-tools-backends.mo +share/locale/hr/LC_MESSAGES/setup-tools-backends.mo +share/locale/hu/LC_MESSAGES/setup-tools-backends.mo +share/locale/id/LC_MESSAGES/setup-tools-backends.mo +share/locale/it/LC_MESSAGES/setup-tools-backends.mo +share/locale/ja/LC_MESSAGES/setup-tools-backends.mo +share/locale/ko/LC_MESSAGES/setup-tools-backends.mo +share/locale/lt/LC_MESSAGES/setup-tools-backends.mo +share/locale/ms/LC_MESSAGES/setup-tools-backends.mo +share/locale/nb/LC_MESSAGES/setup-tools-backends.mo +share/locale/nl/LC_MESSAGES/setup-tools-backends.mo +share/locale/no/LC_MESSAGES/setup-tools-backends.mo +share/locale/pa/LC_MESSAGES/setup-tools-backends.mo +share/locale/pl/LC_MESSAGES/setup-tools-backends.mo +share/locale/pt/LC_MESSAGES/setup-tools-backends.mo +share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo +share/locale/ro/LC_MESSAGES/setup-tools-backends.mo +share/locale/sk/LC_MESSAGES/setup-tools-backends.mo +share/locale/sq/LC_MESSAGES/setup-tools-backends.mo +share/locale/sr/LC_MESSAGES/setup-tools-backends.mo +share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo +share/locale/sv/LC_MESSAGES/setup-tools-backends.mo +share/locale/ta/LC_MESSAGES/setup-tools-backends.mo +share/locale/th/LC_MESSAGES/setup-tools-backends.mo +share/locale/tr/LC_MESSAGES/setup-tools-backends.mo +share/locale/uk/LC_MESSAGES/setup-tools-backends.mo +share/locale/vi/LC_MESSAGES/setup-tools-backends.mo +share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo +share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo +share/setup-tool-backends/files/general_isdn_ppp_options +share/setup-tool-backends/scripts/boot-conf +share/setup-tool-backends/scripts/boot-grub.pl +share/setup-tool-backends/scripts/boot-lilo.pl +share/setup-tool-backends/scripts/boot-yaboot.pl +share/setup-tool-backends/scripts/boot.pl +share/setup-tool-backends/scripts/debug.pl +share/setup-tool-backends/scripts/dhcpd-conf +share/setup-tool-backends/scripts/dhcpd.pl +share/setup-tool-backends/scripts/disks-conf +share/setup-tool-backends/scripts/display-conf +share/setup-tool-backends/scripts/file.pl +share/setup-tool-backends/scripts/filesys.pl +share/setup-tool-backends/scripts/font-conf +share/setup-tool-backends/scripts/font.pl +share/setup-tool-backends/scripts/general.pl +share/setup-tool-backends/scripts/guess_system.sh +share/setup-tool-backends/scripts/internetsharing-conf +share/setup-tool-backends/scripts/ishare.pl +share/setup-tool-backends/scripts/media.pl +share/setup-tool-backends/scripts/memory-conf +share/setup-tool-backends/scripts/mouse-conf +share/setup-tool-backends/scripts/network-conf +share/setup-tool-backends/scripts/network.pl +share/setup-tool-backends/scripts/package-conf +share/setup-tool-backends/scripts/parse.pl +share/setup-tool-backends/scripts/partition.pl +share/setup-tool-backends/scripts/platform.pl +share/setup-tool-backends/scripts/print-conf +share/setup-tool-backends/scripts/print.pl +share/setup-tool-backends/scripts/process.pl +share/setup-tool-backends/scripts/replace.pl +share/setup-tool-backends/scripts/report.pl +share/setup-tool-backends/scripts/service-list.pl +share/setup-tool-backends/scripts/service.pl +share/setup-tool-backends/scripts/services-conf +share/setup-tool-backends/scripts/share.pl +share/setup-tool-backends/scripts/shares-conf +share/setup-tool-backends/scripts/time-conf +share/setup-tool-backends/scripts/tokenizer.pl +share/setup-tool-backends/scripts/type1inst +share/setup-tool-backends/scripts/users-conf +share/setup-tool-backends/scripts/util.pl +share/setup-tool-backends/scripts/x.pl +share/setup-tool-backends/scripts/xml.pl +@dirrm share/setup-tool-backends/scripts +@dirrm share/setup-tool-backends/files +@dirrm share/setup-tool-backends diff --git a/textproc/Makefile b/textproc/Makefile index 3f9bef2e1807..dc2e3fe27ea3 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -129,6 +129,7 @@ SUBDIR += gmat SUBDIR += gmetadom SUBDIR += gnome-translate + SUBDIR += gnomedocutils SUBDIR += gnomespell SUBDIR += gpp SUBDIR += grap diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile new file mode 100644 index 000000000000..171377df0cde --- /dev/null +++ b/textproc/gnome-doc-utils/Makefile @@ -0,0 +1,42 @@ +# New ports collection makefile for: gnome-doc-utils +# Date created: 11 November 2004 +# Whom: Adam Weinberger <adamw@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnomedocutils +PORTVERSION= 0.1.3 +CATEGORIES= textproc gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.1 +DISTNAME= gnome-doc-utils-${PORTVERSION} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME doc utils + +BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper + +PREFIX?= ${X11BASE} + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehier gnometarget gnomehack libxslt +USE_PYTHON= yes +INSTALLS_OMF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/gnome/omf +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +MAN1= xml2po.1 + +DOCBOOK_VERSION=4.1.2 + +post-patch: + @${REINPLACE_CMD} -e 's|4\.2|${DOCBOOK_VERSION}|g' \ + ${WRKSRC}/doc/xslt/C/gnome-doc-xslt.xml \ + ${WRKSRC}/doc/gnome-doc-make/C/gnome-doc-make.xml + +.include <bsd.port.mk> diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo new file mode 100644 index 000000000000..21849b8ee2a4 --- /dev/null +++ b/textproc/gnome-doc-utils/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome-doc-utils-0.1.3.tar.bz2) = d59875bb5924fd098a19a7d229af63cc +SIZE (gnome-doc-utils-0.1.3.tar.bz2) = 287482 diff --git a/textproc/gnome-doc-utils/pkg-descr b/textproc/gnome-doc-utils/pkg-descr new file mode 100644 index 000000000000..f68a678220af --- /dev/null +++ b/textproc/gnome-doc-utils/pkg-descr @@ -0,0 +1 @@ +Insert decent comment here. diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist new file mode 100644 index 000000000000..156055279b27 --- /dev/null +++ b/textproc/gnome-doc-utils/pkg-plist @@ -0,0 +1,101 @@ +bin/gnome-doc-prepare +bin/xml2po +libdata/pkgconfig/gnome-doc-utils.pc +libdata/pkgconfig/xml2po.pc +share/aclocal/gnome-doc-utils.m4 +share/gnome-doc-utils/gnome-doc-utils.make +share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml +share/gnome/help/gnome-doc-make/C/legal.xml +share/gnome/help/gnome-doc-make/C/make-ref.xml +share/gnome/help/gnome-doc-xslt/C/db-chunk.xml +share/gnome/help/gnome-doc-xslt/C/db-common.xml +share/gnome/help/gnome-doc-xslt/C/db-format.xml +share/gnome/help/gnome-doc-xslt/C/db-label.xml +share/gnome/help/gnome-doc-xslt/C/db-title.xml +share/gnome/help/gnome-doc-xslt/C/db-xref.xml +share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml +share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml +share/gnome/help/gnome-doc-xslt/C/db2html-block.xml +share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml +share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-css.xml +share/gnome/help/gnome-doc-xslt/C/db2html-division.xml +share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml +share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-info.xml +share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml +share/gnome/help/gnome-doc-xslt/C/db2html-list.xml +share/gnome/help/gnome-doc-xslt/C/db2html-media.xml +share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml +share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml +share/gnome/help/gnome-doc-xslt/C/db2html-suppressed.xml +share/gnome/help/gnome-doc-xslt/C/db2html-table.xml +share/gnome/help/gnome-doc-xslt/C/db2html-title.xml +share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml +share/gnome/help/gnome-doc-xslt/C/db2html.xml +share/gnome/help/gnome-doc-xslt/C/db2omf.xml +share/gnome/help/gnome-doc-xslt/C/format2xsl.xml +share/gnome/help/gnome-doc-xslt/C/gettext.xml +share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml +share/gnome/help/gnome-doc-xslt/C/legal.xml +share/gnome/help/gnome-doc-xslt/C/translating.xml +share/gnome/help/gnome-doc-xslt/C/xsldoc.xml +share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf +share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf +share/xml/gnome/xslt/docbook/common/db-chunk.xsl +share/xml/gnome/xslt/docbook/common/db-common.xsl +share/xml/gnome/xslt/docbook/common/db-format.xsl +share/xml/gnome/xslt/docbook/common/db-label.xsl +share/xml/gnome/xslt/docbook/common/db-title.xsl +share/xml/gnome/xslt/docbook/common/db-xref.xsl +share/xml/gnome/xslt/docbook/html/db2html-admon.xsl +share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl +share/xml/gnome/xslt/docbook/html/db2html-block.xsl +share/xml/gnome/xslt/docbook/html/db2html-callout.xsl +share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-css.xsl +share/xml/gnome/xslt/docbook/html/db2html-division.xsl +share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl +share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-info.xsl +share/xml/gnome/xslt/docbook/html/db2html-inline.xsl +share/xml/gnome/xslt/docbook/html/db2html-list.xsl +share/xml/gnome/xslt/docbook/html/db2html-media.xsl +share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl +share/xml/gnome/xslt/docbook/html/db2html-refentry.xsl +share/xml/gnome/xslt/docbook/html/db2html-suppressed.xsl +share/xml/gnome/xslt/docbook/html/db2html-table.xsl +share/xml/gnome/xslt/docbook/html/db2html-title.xsl +share/xml/gnome/xslt/docbook/html/db2html-xref.xsl +share/xml/gnome/xslt/docbook/html/db2html.xsl +share/xml/gnome/xslt/docbook/omf/db2omf.xsl +share/xml/gnome/xslt/docbook/utils/chunks.xsl +share/xml/gnome/xslt/docbook/utils/credits.xsl +share/xml/gnome/xslt/docbook/utils/ids.xsl +share/xml/gnome/xslt/gettext/format2xsl.xsl +share/xml/gnome/xslt/gettext/gettext.xsl +share/xml/gnome/xslt/gettext/l10n.xml +share/xml/gnome/xslt/xsldoc/xsldoc.xsl +share/xml2po/docbook.py +share/xml2po/empty.py +share/xml2po/gs.py +@dirrm share/xml2po +@dirrm share/xml/gnome/xslt/xsldoc +@dirrm share/xml/gnome/xslt/gettext +@dirrm share/xml/gnome/xslt/docbook/utils +@dirrm share/xml/gnome/xslt/docbook/omf +@dirrm share/xml/gnome/xslt/docbook/html +@dirrm share/xml/gnome/xslt/docbook/common +@dirrm share/xml/gnome/xslt/docbook +@dirrm share/xml/gnome/xslt +@dirrm share/xml/gnome +@dirrm share/xml +@dirrm share/gnome/omf/gnome-doc-xslt +@dirrm share/gnome/omf/gnome-doc-make +@dirrm share/gnome/help/gnome-doc-xslt/C +@dirrm share/gnome/help/gnome-doc-xslt +@dirrm share/gnome/help/gnome-doc-make/C +@dirrm share/gnome/help/gnome-doc-make +@dirrm share/gnome-doc-utils diff --git a/textproc/gnomedocutils/Makefile b/textproc/gnomedocutils/Makefile new file mode 100644 index 000000000000..171377df0cde --- /dev/null +++ b/textproc/gnomedocutils/Makefile @@ -0,0 +1,42 @@ +# New ports collection makefile for: gnome-doc-utils +# Date created: 11 November 2004 +# Whom: Adam Weinberger <adamw@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnomedocutils +PORTVERSION= 0.1.3 +CATEGORIES= textproc gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-doc-utils/0.1 +DISTNAME= gnome-doc-utils-${PORTVERSION} + +MAINTAINER= gnome@FreeBSD.org +COMMENT= GNOME doc utils + +BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper +RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper + +PREFIX?= ${X11BASE} + +USE_BZIP2= yes +USE_GMAKE= yes +USE_GNOME= gnomehier gnometarget gnomehack libxslt +USE_PYTHON= yes +INSTALLS_OMF= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/gnome/omf +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +MAN1= xml2po.1 + +DOCBOOK_VERSION=4.1.2 + +post-patch: + @${REINPLACE_CMD} -e 's|4\.2|${DOCBOOK_VERSION}|g' \ + ${WRKSRC}/doc/xslt/C/gnome-doc-xslt.xml \ + ${WRKSRC}/doc/gnome-doc-make/C/gnome-doc-make.xml + +.include <bsd.port.mk> diff --git a/textproc/gnomedocutils/distinfo b/textproc/gnomedocutils/distinfo new file mode 100644 index 000000000000..21849b8ee2a4 --- /dev/null +++ b/textproc/gnomedocutils/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome-doc-utils-0.1.3.tar.bz2) = d59875bb5924fd098a19a7d229af63cc +SIZE (gnome-doc-utils-0.1.3.tar.bz2) = 287482 diff --git a/textproc/gnomedocutils/pkg-descr b/textproc/gnomedocutils/pkg-descr new file mode 100644 index 000000000000..f68a678220af --- /dev/null +++ b/textproc/gnomedocutils/pkg-descr @@ -0,0 +1 @@ +Insert decent comment here. diff --git a/textproc/gnomedocutils/pkg-plist b/textproc/gnomedocutils/pkg-plist new file mode 100644 index 000000000000..156055279b27 --- /dev/null +++ b/textproc/gnomedocutils/pkg-plist @@ -0,0 +1,101 @@ +bin/gnome-doc-prepare +bin/xml2po +libdata/pkgconfig/gnome-doc-utils.pc +libdata/pkgconfig/xml2po.pc +share/aclocal/gnome-doc-utils.m4 +share/gnome-doc-utils/gnome-doc-utils.make +share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml +share/gnome/help/gnome-doc-make/C/legal.xml +share/gnome/help/gnome-doc-make/C/make-ref.xml +share/gnome/help/gnome-doc-xslt/C/db-chunk.xml +share/gnome/help/gnome-doc-xslt/C/db-common.xml +share/gnome/help/gnome-doc-xslt/C/db-format.xml +share/gnome/help/gnome-doc-xslt/C/db-label.xml +share/gnome/help/gnome-doc-xslt/C/db-title.xml +share/gnome/help/gnome-doc-xslt/C/db-xref.xml +share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml +share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml +share/gnome/help/gnome-doc-xslt/C/db2html-block.xml +share/gnome/help/gnome-doc-xslt/C/db2html-callout.xml +share/gnome/help/gnome-doc-xslt/C/db2html-classsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-cmdsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-css.xml +share/gnome/help/gnome-doc-xslt/C/db2html-division.xml +share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml +share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml +share/gnome/help/gnome-doc-xslt/C/db2html-info.xml +share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml +share/gnome/help/gnome-doc-xslt/C/db2html-list.xml +share/gnome/help/gnome-doc-xslt/C/db2html-media.xml +share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml +share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml +share/gnome/help/gnome-doc-xslt/C/db2html-suppressed.xml +share/gnome/help/gnome-doc-xslt/C/db2html-table.xml +share/gnome/help/gnome-doc-xslt/C/db2html-title.xml +share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml +share/gnome/help/gnome-doc-xslt/C/db2html.xml +share/gnome/help/gnome-doc-xslt/C/db2omf.xml +share/gnome/help/gnome-doc-xslt/C/format2xsl.xml +share/gnome/help/gnome-doc-xslt/C/gettext.xml +share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml +share/gnome/help/gnome-doc-xslt/C/legal.xml +share/gnome/help/gnome-doc-xslt/C/translating.xml +share/gnome/help/gnome-doc-xslt/C/xsldoc.xml +share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf +share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf +share/xml/gnome/xslt/docbook/common/db-chunk.xsl +share/xml/gnome/xslt/docbook/common/db-common.xsl +share/xml/gnome/xslt/docbook/common/db-format.xsl +share/xml/gnome/xslt/docbook/common/db-label.xsl +share/xml/gnome/xslt/docbook/common/db-title.xsl +share/xml/gnome/xslt/docbook/common/db-xref.xsl +share/xml/gnome/xslt/docbook/html/db2html-admon.xsl +share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl +share/xml/gnome/xslt/docbook/html/db2html-block.xsl +share/xml/gnome/xslt/docbook/html/db2html-callout.xsl +share/xml/gnome/xslt/docbook/html/db2html-classsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-cmdsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-css.xsl +share/xml/gnome/xslt/docbook/html/db2html-division.xsl +share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl +share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl +share/xml/gnome/xslt/docbook/html/db2html-info.xsl +share/xml/gnome/xslt/docbook/html/db2html-inline.xsl +share/xml/gnome/xslt/docbook/html/db2html-list.xsl +share/xml/gnome/xslt/docbook/html/db2html-media.xsl +share/xml/gnome/xslt/docbook/html/db2html-qanda.xsl +share/xml/gnome/xslt/docbook/html/db2html-refentry.xsl +share/xml/gnome/xslt/docbook/html/db2html-suppressed.xsl +share/xml/gnome/xslt/docbook/html/db2html-table.xsl +share/xml/gnome/xslt/docbook/html/db2html-title.xsl +share/xml/gnome/xslt/docbook/html/db2html-xref.xsl +share/xml/gnome/xslt/docbook/html/db2html.xsl +share/xml/gnome/xslt/docbook/omf/db2omf.xsl +share/xml/gnome/xslt/docbook/utils/chunks.xsl +share/xml/gnome/xslt/docbook/utils/credits.xsl +share/xml/gnome/xslt/docbook/utils/ids.xsl +share/xml/gnome/xslt/gettext/format2xsl.xsl +share/xml/gnome/xslt/gettext/gettext.xsl +share/xml/gnome/xslt/gettext/l10n.xml +share/xml/gnome/xslt/xsldoc/xsldoc.xsl +share/xml2po/docbook.py +share/xml2po/empty.py +share/xml2po/gs.py +@dirrm share/xml2po +@dirrm share/xml/gnome/xslt/xsldoc +@dirrm share/xml/gnome/xslt/gettext +@dirrm share/xml/gnome/xslt/docbook/utils +@dirrm share/xml/gnome/xslt/docbook/omf +@dirrm share/xml/gnome/xslt/docbook/html +@dirrm share/xml/gnome/xslt/docbook/common +@dirrm share/xml/gnome/xslt/docbook +@dirrm share/xml/gnome/xslt +@dirrm share/xml/gnome +@dirrm share/xml +@dirrm share/gnome/omf/gnome-doc-xslt +@dirrm share/gnome/omf/gnome-doc-make +@dirrm share/gnome/help/gnome-doc-xslt/C +@dirrm share/gnome/help/gnome-doc-xslt +@dirrm share/gnome/help/gnome-doc-make/C +@dirrm share/gnome/help/gnome-doc-make +@dirrm share/gnome-doc-utils diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index 19d674cd8ae5..ee3bb7f651b0 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -6,10 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.4.5 +PORTVERSION= 1.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/1.6 PKGNAMESUFFIX= -extensions DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -40,14 +40,14 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnometarget +USE_GNOME= gnomeprefix gnomehack intlhack gnometarget USE_LIBTOOL_VER=15 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-extensions="all" -PLIST_SUB= VERSION="1.4" +PLIST_SUB= VERSION="1.6" EPHY_VERSION="1.6" .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) .undef WITHOUT_OPENSP diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo index f26d3cf36625..28b6577311cc 100644 --- a/www/epiphany-extensions/distinfo +++ b/www/epiphany-extensions/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-extensions-1.4.5.tar.bz2) = 8e7edc694283c53bec4d128527a0ecff -SIZE (gnome2/epiphany-extensions-1.4.5.tar.bz2) = 470431 +MD5 (gnome2/epiphany-extensions-1.6.0.tar.bz2) = c9f6d0e6b817120e8aec671529ad5ee8 +SIZE (gnome2/epiphany-extensions-1.6.0.tar.bz2) = 550293 diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist index 694b55312ee1..5f6f6e1abfd4 100644 --- a/www/epiphany-extensions/pkg-plist +++ b/www/epiphany-extensions/pkg-plist @@ -1,72 +1,77 @@ -lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.a +lib/epiphany-%%VERSION%%/extensions/actions.xml +lib/epiphany-%%VERSION%%/extensions/bookmarks-tray.xml +lib/epiphany-%%VERSION%%/extensions/certificates.xml +lib/epiphany-%%VERSION%%/extensions/dashboard.xml +lib/epiphany-%%VERSION%%/extensions/error-viewer.xml +lib/epiphany-%%VERSION%%/extensions/extensions-manager-ui.xml +lib/epiphany-%%VERSION%%/extensions/gestures.xml +lib/epiphany-%%VERSION%%/extensions/libactionsextension.a +lib/epiphany-%%VERSION%%/extensions/libactionsextension.so +lib/epiphany-%%VERSION%%/extensions/libactionsextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libbookmarkstrayextension.so lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so -lib/epiphany-%%VERSION%%/extensions/libcertificatesextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libdashboardextension.a lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so -lib/epiphany-%%VERSION%%/extensions/libdashboardextension.so.0 -lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.a lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so -lib/epiphany-%%VERSION%%/extensions/liberrorviewerextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libgesturesextension.a +lib/epiphany-%%VERSION%%/extensions/libextensionsmanageruiextension.so lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so -lib/epiphany-%%VERSION%%/extensions/libgesturesextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.a lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so -lib/epiphany-%%VERSION%%/extensions/libpageinfoextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.a lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so -lib/epiphany-%%VERSION%%/extensions/libselectstylesheetextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libsidebarextension.a lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so -lib/epiphany-%%VERSION%%/extensions/libsidebarextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.a lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so -lib/epiphany-%%VERSION%%/extensions/libsmartbookmarksextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.a lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so -lib/epiphany-%%VERSION%%/extensions/libtabgroupsextension.so.0 -lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.a lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so -lib/epiphany-%%VERSION%%/extensions/libtabsmenuextension.so.0 +lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.a +lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so +lib/epiphany-%%VERSION%%/extensions/libtabstatesextension.so.0 +lib/epiphany-%%VERSION%%/extensions/tab-states.xml +lib/epiphany-%%VERSION%%/extensions/page-info.xml +lib/epiphany-%%VERSION%%/extensions/select-stylesheet.xml +lib/epiphany-%%VERSION%%/extensions/sidebar.xml +lib/epiphany-%%VERSION%%/extensions/smart-bookmarks.xml +lib/epiphany-%%VERSION%%/extensions/tab-groups.xml +lib/epiphany-%%VERSION%%/extensions/tabsmenu.xml share/gnome/epiphany-extensions/ephy-gestures.xml +share/gnome/epiphany-extensions/glade/action-properties.glade +share/gnome/epiphany-extensions/glade/actions-editor.glade share/gnome/epiphany-extensions/glade/error-viewer.glade +share/gnome/epiphany-extensions/glade/extensions-manager-ui.glade share/gnome/epiphany-extensions/glade/page-info.glade -share/gnome/epiphany-extensions/glade/smart-bookmarks.glade +share/gnome/epiphany-extensions/xml/ephy-bookmarks-tray-ui.xml share/gnome/epiphany-extensions/xml/epiphany-sidebar-ui.xml share/gnome/epiphany-extensions/xml/page-info-context-ui.xml -share/locale/bg/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/ca/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/da/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/no/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/pa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/ru/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/sk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/sq/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/wa/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%VERSION%%.mo +share/locale/bg/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ca/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/cs/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/da/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/de/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/el/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/en_CA/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/en_GB/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/es/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/fr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/hr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/hu/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/it/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ja/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ko/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/lt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/nl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/no/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/pa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/pl/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/pt/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/pt_BR/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/ru/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sq/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sr/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/sv/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/uk/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/wa/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo +share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-%%EPHY_VERSION%%.mo @dirrm share/gnome/epiphany-extensions/xml @dirrm share/gnome/epiphany-extensions/glade @dirrm share/gnome/epiphany-extensions -@dirrm lib/epiphany-%%VERSION%%/extensions -@dirrm lib/epiphany-%%VERSION%% +@unexec rmdir %D/lib/epiphany-%%VERSION%%/extensions 2>/dev/null || true +@unexec rmdir %D/lib/epiphany-%%VERSION%% 2>/dev/null || true diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 25d659b03d63..9f3afb06a15b 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -6,10 +6,10 @@ # PORTNAME= epiphany -PORTVERSION= 1.4.8 +PORTVERSION= 1.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -36,11 +36,12 @@ HEADERS_SUFX= USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui desktopfileutils +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop desktopfileutils USE_LIBTOOL_VER=15 USE_GMAKE= yes USE_REINPLACE= yes +INSTALLS_OMF= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ @@ -55,14 +56,10 @@ MAN1= epiphany.1 .include <bsd.port.pre.mk> -.if ${OSVERSION} > 500000 -# Galeon does not build correctly in -CURRENT if -Werror is passed -# to the compiler. NO_WERROR= yes -.endif # allow build with more warnings enabled .if defined(NO_WERROR) -CONFIGURE_ARGS+= --disable-werror +CONFIGURE_ARGS+= --enable-compile-warnings=no .endif .if ${OSVERSION} < 500000 @@ -101,6 +98,6 @@ post-configure: post-install: @${MV} -f ${PREFIX}/bin/epiphany ${PREFIX}/bin/epiphany-bin ${INSTALL_SCRIPT} ${WRKDIR}/epiphany ${PREFIX}/bin - @-update-desktop-database > /dev/null + @-update-desktop-database .include <bsd.port.post.mk> diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo index a2b527a3b181..e2a19172bd9c 100644 --- a/www/epiphany/distinfo +++ b/www/epiphany/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/epiphany-1.4.8.tar.bz2) = bb9bdb92c5b4a7a97029e942304a9373 -SIZE (gnome2/epiphany-1.4.8.tar.bz2) = 3594408 +MD5 (gnome2/epiphany-1.6.0.tar.bz2) = 53eda1c713aec26a51fb806210c8afa7 +SIZE (gnome2/epiphany-1.6.0.tar.bz2) = 2983514 diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index c71b7db133e0..9da0f027eb82 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -1,6 +1,7 @@ bin/epiphany bin/epiphany-bin include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-bookmarks-type-builtins.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-command-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-cookie-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-dialog.h @@ -10,10 +11,14 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-persist.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-prefs.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-shell.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-single.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed-type-builtins.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-embed.h -include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-encodings.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extension.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-extensions-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-history.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-lib-type-builtins.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-link.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-loader.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node-db.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-node.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-notebook.h @@ -21,11 +26,13 @@ include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-password-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-permission-manager.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-session.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-shell.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-state.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-statusbar.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-tab.h +include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-type-builtins.h include/epiphany-%%EPHY_VERSION%%/epiphany/ephy-window.h libdata/bonobo/servers/GNOME_Epiphany_Automation.server -libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc +libdata/pkgconfig/epiphany-1.6.pc %%DOCSDIR%%/EphyCommandManager.html %%DOCSDIR%%/EphyEmbed.html %%DOCSDIR%%/EphyEmbedPersist.html @@ -37,6 +44,7 @@ libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/ch02.html %%DOCSDIR%%/epiphany-EphyEmbedFactory.html +%%DOCSDIR%%/epiphany-EphyExtensionsManager.html %%DOCSDIR%%/epiphany-EphyGlade.html %%DOCSDIR%%/epiphany-ephy-cookie-manager.html %%DOCSDIR%%/epiphany-ephy-password-manager.html @@ -59,13 +67,12 @@ share/gnome/epiphany/art/epiphany-download.png share/gnome/epiphany/art/epiphany-entry.png share/gnome/epiphany/art/epiphany-history.png share/gnome/epiphany/art/epiphany-popup-hidden.png -share/gnome/epiphany/art/epiphany-secure.png -share/gnome/epiphany/art/epiphany-unsecure.png share/gnome/epiphany/art/hand-open.png -share/gnome/epiphany/conspiracy.xhtml share/gnome/epiphany/default-prefs.js share/gnome/epiphany/epiphany-bookmark-editor-ui.xml +share/gnome/epiphany/epiphany-bookmarks-html.xsl share/gnome/epiphany/epiphany-bookmarksbar.xml +share/gnome/epiphany/epiphany-extension.xsd share/gnome/epiphany/epiphany-fs-toolbar.xml share/gnome/epiphany/epiphany-history-window-ui.xml share/gnome/epiphany/epiphany-toolbar.xml @@ -104,11 +111,18 @@ share/gnome/help/epiphany/ja/figures/ephy-bookmarkbar-smartbookmark-screenshot.p share/gnome/help/epiphany/ja/figures/ephy-history-window-screenshot.png share/gnome/help/epiphany/ja/figures/ephy-screenshot.png share/gnome/help/epiphany/ja/legal.xml +share/gnome/help/epiphany/uk/epiphany.xml +share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png +share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png +share/gnome/help/epiphany/uk/figures/ephy-screenshot.png +share/gnome/help/epiphany/uk/legal.xml share/gnome/omf/epiphany/epiphany-C.omf share/gnome/omf/epiphany/epiphany-es.omf share/gnome/omf/epiphany/epiphany-eu.omf share/gnome/omf/epiphany/epiphany-fi.omf share/gnome/omf/epiphany/epiphany-ja.omf +share/gnome/omf/epiphany/epiphany-uk.omf share/gnome/pixmaps/epiphany-bookmarks.png share/locale/am/LC_MESSAGES/epiphany.mo share/locale/ar/LC_MESSAGES/epiphany.mo @@ -176,6 +190,8 @@ share/locale/wa/LC_MESSAGES/epiphany.mo share/locale/zh_CN/LC_MESSAGES/epiphany.mo share/locale/zh_TW/LC_MESSAGES/epiphany.mo @dirrm share/gnome/omf/epiphany +@dirrm share/gnome/help/epiphany/uk/figures +@dirrm share/gnome/help/epiphany/uk @dirrm share/gnome/help/epiphany/ja/figures @dirrm share/gnome/help/epiphany/ja @dirrm share/gnome/help/epiphany/fi/figures diff --git a/www/evolution-webcal/Makefile b/www/evolution-webcal/Makefile index a6837f01eea9..3c14160001dc 100644 --- a/www/evolution-webcal/Makefile +++ b/www/evolution-webcal/Makefile @@ -6,11 +6,10 @@ # PORTNAME= webcal -PORTVERSION= 2.0.1 -PORTREVISION= 1 +PORTVERSION= 2.2.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.0 +MASTER_SITE_SUBDIR= sources/${PKGNAMEPREFIX}${PORTNAME}/2.2 PKGNAMEPREFIX= evolution- DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} diff --git a/www/evolution-webcal/distinfo b/www/evolution-webcal/distinfo index c9ed8d4cf804..3d7587122a0d 100644 --- a/www/evolution-webcal/distinfo +++ b/www/evolution-webcal/distinfo @@ -1,2 +1,2 @@ -MD5 (evolution-webcal-2.0.1.tar.bz2) = a29be3b55e6def3b56ffa3c48b349b40 -SIZE (evolution-webcal-2.0.1.tar.bz2) = 144969 +MD5 (evolution-webcal-2.2.0.tar.bz2) = a96ccdc8ec6c937fc87dd2bb650bfdf1 +SIZE (evolution-webcal-2.2.0.tar.bz2) = 139078 diff --git a/www/evolution-webcal/pkg-plist b/www/evolution-webcal/pkg-plist index f841cb7faa8e..21bc932a66b6 100644 --- a/www/evolution-webcal/pkg-plist +++ b/www/evolution-webcal/pkg-plist @@ -1,5 +1,4 @@ libexec/evolution-webcal -share/gnome/application-registry/evolution-webcal.applications share/locale/ar/LC_MESSAGES/evolution-webcal.mo share/locale/az/LC_MESSAGES/evolution-webcal.mo share/locale/bg/LC_MESSAGES/evolution-webcal.mo @@ -14,17 +13,22 @@ share/locale/el/LC_MESSAGES/evolution-webcal.mo share/locale/en_CA/LC_MESSAGES/evolution-webcal.mo share/locale/en_GB/LC_MESSAGES/evolution-webcal.mo share/locale/es/LC_MESSAGES/evolution-webcal.mo +share/locale/et/LC_MESSAGES/evolution-webcal.mo share/locale/eu/LC_MESSAGES/evolution-webcal.mo +share/locale/fa/LC_MESSAGES/evolution-webcal.mo share/locale/fi/LC_MESSAGES/evolution-webcal.mo share/locale/fr/LC_MESSAGES/evolution-webcal.mo share/locale/gu/LC_MESSAGES/evolution-webcal.mo share/locale/hi/LC_MESSAGES/evolution-webcal.mo share/locale/hu/LC_MESSAGES/evolution-webcal.mo +share/locale/id/LC_MESSAGES/evolution-webcal.mo share/locale/it/LC_MESSAGES/evolution-webcal.mo share/locale/ja/LC_MESSAGES/evolution-webcal.mo share/locale/ko/LC_MESSAGES/evolution-webcal.mo +share/locale/lt/LC_MESSAGES/evolution-webcal.mo share/locale/ms/LC_MESSAGES/evolution-webcal.mo share/locale/nb/LC_MESSAGES/evolution-webcal.mo +share/locale/ne/LC_MESSAGES/evolution-webcal.mo share/locale/nl/LC_MESSAGES/evolution-webcal.mo share/locale/no/LC_MESSAGES/evolution-webcal.mo share/locale/or/LC_MESSAGES/evolution-webcal.mo @@ -38,6 +42,7 @@ share/locale/sr/LC_MESSAGES/evolution-webcal.mo share/locale/sr@Latn/LC_MESSAGES/evolution-webcal.mo share/locale/sv/LC_MESSAGES/evolution-webcal.mo share/locale/ta/LC_MESSAGES/evolution-webcal.mo +share/locale/th/LC_MESSAGES/evolution-webcal.mo share/locale/tr/LC_MESSAGES/evolution-webcal.mo share/locale/uk/LC_MESSAGES/evolution-webcal.mo share/locale/vi/LC_MESSAGES/evolution-webcal.mo diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index c121c5312d17..e44a89101dae 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.2.5 +PORTVERSION= 3.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.6 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,10 +27,6 @@ USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="3.1" - -post-patch: - @${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR}|g' \ - ${WRKSRC}/po/Makefile.in.in +PLIST_SUB= VERSION="3.6" .include <bsd.port.mk> diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo index 1ecf07b8d8cc..3809c42806f5 100644 --- a/www/gtkhtml3/distinfo +++ b/www/gtkhtml3/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.2.5.tar.bz2) = 86e1ce32fed536bce5b2d6e8d41b0c65 -SIZE (gnome2/gtkhtml-3.2.5.tar.bz2) = 1315567 +MD5 (gnome2/gtkhtml-3.6.0.tar.bz2) = a53378f57544ef2e2e7b40616dc237a1 +SIZE (gnome2/gtkhtml-3.6.0.tar.bz2) = 1348975 diff --git a/mail/evolution-exchange/files/patch-po::Makefile.in.in b/www/gtkhtml3/files/patch-po_Makefile.in.in index 042bef6eb7fc..df4fac948548 100644 --- a/mail/evolution-exchange/files/patch-po::Makefile.in.in +++ b/www/gtkhtml3/files/patch-po_Makefile.in.in @@ -1,11 +1,10 @@ ---- po/Makefile.in.in.orig Sun Jul 25 18:30:57 2004 -+++ po/Makefile.in.in Sun Jul 25 18:31:20 2004 -@@ -32,6 +32,8 @@ +--- po/Makefile.in.in.orig Tue Nov 23 17:53:53 2004 ++++ po/Makefile.in.in Tue Nov 23 17:58:38 2004 +@@ -31,6 +31,7 @@ + localedir = $(libdir)/locale gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po -+mkdir_p = @mkdir_p@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + subdir = po INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c new file mode 100644 index 000000000000..f970e5b654c2 --- /dev/null +++ b/www/gtkhtml3/files/patch-src_htmltext.c @@ -0,0 +1,15 @@ +--- src/htmltext.c.orig Wed Dec 8 01:45:57 2004 ++++ src/htmltext.c Wed Dec 8 01:46:10 2004 +@@ -2433,10 +2433,11 @@ + gsize + html_text_sanitize (const gchar **str, gint *len) + { ++ gchar *end; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (len != NULL, 0); + +- gchar *end = offset_to_pointer_validated (*str, *len, len); ++ end = offset_to_pointer_validated (*str, *len, len); + if (end) { + return end - *str; + } else { diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist index 796491d14ceb..5c4468b4861a 100644 --- a/www/gtkhtml3/pkg-plist +++ b/www/gtkhtml3/pkg-plist @@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.12 +lib/libgtkhtml-%%VERSION%%.so.18 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc share/gnome/gtkhtml-%%VERSION%%/Editor.idl @@ -179,7 +179,6 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index c121c5312d17..e44a89101dae 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gtkhtml3 -PORTVERSION= 3.2.5 +PORTVERSION= 3.6.0 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/3.6 DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -27,10 +27,6 @@ USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="3.1" - -post-patch: - @${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR}|g' \ - ${WRKSRC}/po/Makefile.in.in +PLIST_SUB= VERSION="3.6" .include <bsd.port.mk> diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo index 1ecf07b8d8cc..3809c42806f5 100644 --- a/www/gtkhtml38/distinfo +++ b/www/gtkhtml38/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtkhtml-3.2.5.tar.bz2) = 86e1ce32fed536bce5b2d6e8d41b0c65 -SIZE (gnome2/gtkhtml-3.2.5.tar.bz2) = 1315567 +MD5 (gnome2/gtkhtml-3.6.0.tar.bz2) = a53378f57544ef2e2e7b40616dc237a1 +SIZE (gnome2/gtkhtml-3.6.0.tar.bz2) = 1348975 diff --git a/mail/ximian-connector/files/patch-po::Makefile.in.in b/www/gtkhtml38/files/patch-po_Makefile.in.in index 042bef6eb7fc..df4fac948548 100644 --- a/mail/ximian-connector/files/patch-po::Makefile.in.in +++ b/www/gtkhtml38/files/patch-po_Makefile.in.in @@ -1,11 +1,10 @@ ---- po/Makefile.in.in.orig Sun Jul 25 18:30:57 2004 -+++ po/Makefile.in.in Sun Jul 25 18:31:20 2004 -@@ -32,6 +32,8 @@ +--- po/Makefile.in.in.orig Tue Nov 23 17:53:53 2004 ++++ po/Makefile.in.in Tue Nov 23 17:58:38 2004 +@@ -31,6 +31,7 @@ + localedir = $(libdir)/locale gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po - subdir = po -+mkdir_p = @mkdir_p@ +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + subdir = po INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c new file mode 100644 index 000000000000..f970e5b654c2 --- /dev/null +++ b/www/gtkhtml38/files/patch-src_htmltext.c @@ -0,0 +1,15 @@ +--- src/htmltext.c.orig Wed Dec 8 01:45:57 2004 ++++ src/htmltext.c Wed Dec 8 01:46:10 2004 +@@ -2433,10 +2433,11 @@ + gsize + html_text_sanitize (const gchar **str, gint *len) + { ++ gchar *end; + g_return_val_if_fail (str != NULL, 0); + g_return_val_if_fail (len != NULL, 0); + +- gchar *end = offset_to_pointer_validated (*str, *len, len); ++ end = offset_to_pointer_validated (*str, *len, len); + if (end) { + return end - *str; + } else { diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist index 796491d14ceb..5c4468b4861a 100644 --- a/www/gtkhtml38/pkg-plist +++ b/www/gtkhtml38/pkg-plist @@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so lib/libgtkhtml-%%VERSION%%.a lib/libgtkhtml-%%VERSION%%.so -lib/libgtkhtml-%%VERSION%%.so.12 +lib/libgtkhtml-%%VERSION%%.so.18 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc share/gnome/gtkhtml-%%VERSION%%/Editor.idl @@ -179,7 +179,6 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile index 277c94cbe920..ad37cecf0e72 100644 --- a/x11-fm/nautilus2/Makefile +++ b/x11-fm/nautilus2/Makefile @@ -6,22 +6,23 @@ # PORTNAME= nautilus2 -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10 DISTNAME= nautilus-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME file manager and graphical shell developed by Eazel +LIB_DEPENDS= exif.10:${PORTSDIR}/graphics/libexif + USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop eel2 \ - librsvg2 +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop eel2 \ + librsvg2 desktopfileutils GNOME_DESKTOP_VERSION=2 INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 @@ -38,6 +39,7 @@ GCONF_SCHEMAS= apps_nautilus_preferences.schemas post-install: ${MKDIR} ${PREFIX}/lib/nautilus/extensions-1.0 + @-update-desktop-database # @${CHMOD} u+w ${PREFIX}/share/gnome/nautilus/*.desktop .include <bsd.port.mk> diff --git a/x11-fm/nautilus2/distinfo b/x11-fm/nautilus2/distinfo index 1645076c4527..b400faa1d0dd 100644 --- a/x11-fm/nautilus2/distinfo +++ b/x11-fm/nautilus2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/nautilus-2.8.2.tar.bz2) = d5fdec9acc37181016e8424e96d663b8 -SIZE (gnome2/nautilus-2.8.2.tar.bz2) = 5808170 +MD5 (gnome2/nautilus-2.10.0.tar.bz2) = b29a02be8733a82e002179e2e0f3fe83 +SIZE (gnome2/nautilus-2.10.0.tar.bz2) = 5899170 diff --git a/x11-fm/nautilus2/files/patch-Makefile.in b/x11-fm/nautilus2/files/patch-Makefile.in index 7cb9fd809448..a4f79ca6bb37 100644 --- a/x11-fm/nautilus2/files/patch-Makefile.in +++ b/x11-fm/nautilus2/files/patch-Makefile.in @@ -1,11 +1,10 @@ ---- Makefile.in.orig Mon Aug 16 11:35:20 2004 -+++ Makefile.in Mon Aug 16 11:35:34 2004 -@@ -179,7 +179,7 @@ - DESKTOP_SETTINGS_FILES = nautilus-file-management-properties.desktop - - --SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src test components po data icons docs $(NULL) -+SUBDIRS = libnautilus libnautilus-extension cut-n-paste-code libbackground libnautilus-private libnautilus-adapter src components po data icons docs $(NULL) - - - EXTRA_DIST = COPYING.LIB COPYING-DOCS HACKING MAINTAINERS nautilus.spec.in nautilus.desktop nautilus.desktop.in ChangeLog-20000414 ChangeLog-20000625 ChangeLog-20000831 ChangeLog-20001018 intltool-extract.in intltool-merge.in intltool-update.in Makefile.shared add-include-prefix $(DESKTOP_IN_FILES) $(DESKTOP_APPLICATIONS_FILES) $(DESKTOP_SETTINGS_FILES) $(NULL) +--- Makefile.in.orig Wed Nov 24 13:14:21 2004 ++++ Makefile.in Wed Nov 24 13:14:47 2004 +@@ -183,7 +183,6 @@ + libbackground \ + libnautilus-private \ + src \ +- test \ + po \ + data \ + icons \ diff --git a/x11-fm/nautilus2/files/patch-aa b/x11-fm/nautilus2/files/patch-aa index d4741108d1e0..73824998fced 100644 --- a/x11-fm/nautilus2/files/patch-aa +++ b/x11-fm/nautilus2/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Mon Nov 10 22:08:05 2003 +++ configure Mon Nov 10 22:08:05 2003 -@@ -12971,7 +12971,7 @@ - - LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" - --LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" -+LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`" - - - 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" @@ -12979,7 +12979,7 @@ CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" diff --git a/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c b/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c deleted file mode 100644 index 2ef7220f41e2..000000000000 --- a/x11-fm/nautilus2/files/patch-components-image_properties-nautilus-image-properties-view.c +++ /dev/null @@ -1,18 +0,0 @@ ---- components/image_properties/nautilus-image-properties-view.c.orig Tue Mar 9 06:23:37 2004 -+++ components/image_properties/nautilus-image-properties-view.c Wed Oct 13 01:38:33 2004 -@@ -124,13 +124,14 @@ - exif_content_callback (ExifContent *content, gpointer data) - { - struct ExifAttribute *attribute; -+ char value[1024]; - - attribute = (struct ExifAttribute *)data; - if (attribute->found) { - return; - } - -- attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); -+ attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, value, sizeof(value))); - if (attribute->value != NULL) { - attribute->found = TRUE; - } diff --git a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml b/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml deleted file mode 100644 index 54ea8ae375f6..000000000000 --- a/x11-fm/nautilus2/files/patch-data_static_bookmarks.xml +++ /dev/null @@ -1,84 +0,0 @@ ---- data/static_bookmarks.xml.orig Wed Jun 5 22:58:43 2002 -+++ data/static_bookmarks.xml Wed Jun 5 23:30:11 2002 -@@ -1,54 +1,44 @@ - <?xml version="1.0"?> - <bookmarks> - <folder _name="Software"> -- <bookmark _name="Allaire" icon_name="i-web" uri="http://www.allaire.com/Products/index.cfm"/> -- <bookmark _name="Borland" icon_name="i-web" uri="http://www.borland.com/kylix/"/> -- <bookmark _name="MandrakeSoft" icon_name="i-web" uri="http://mandrakesoft.com/"/> -- <bookmark _name="Netraverse" icon_name="i-web" uri="http://www.netraverse.com"/> -- <bookmark _name="Red Hat" icon_name="i-web" uri="http://www.redhat.com"/> -- <bookmark _name="SuSE" icon_name="i-web" uri="http://www.suse.com"/> -+ <bookmark _name="4Front Technologies" icon_name="i-web" uri="http://www.4front-tech.com"/> -+ <bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/freebsd1.html"/> -+ <bookmark _name="FreeBSD" icon_name="i-web" uri="http://www.freebsd.org"/> -+ <bookmark _name="GNOME" icon_name="i-web" uri="http://www.gnome.org/"/> - <bookmark _name="Sun StarOffice" icon_name="i-web" uri="http://www.sun.com/products/staroffice/"/> - <bookmark _name="Ximian" icon_name="i-web" uri="http://www.ximian.com"/> -- <bookmark _name="Zero-Knowledge" icon_name="i-web" uri="http://www.zeroknowledge.com"/> - </folder> - <folder _name="Hardware"> -- <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com/products/software/linux/"/> -- <bookmark _name="CNET Computers.com" icon_name="i-web" uri="http://computers.cnet.com/hardware/0-1016.html"/> -- <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com/linux/"/> -- <bookmark _name="Penguin Computing" icon_name="i-web" uri="http://www.penguincomputing.com"/> -- <bookmark _name="ZDNet Linux Hardware Database" icon_name="i-web" uri="http://lhd.zdnet.com"/> -+ <bookmark _name="Adaptec" icon_name="i-web" uri="http://www.adaptec.com"/> -+ <bookmark _name="BSD Mall" icon_name="i-web" uri="http://www.bsdmall.com/hardware.html"/> -+ <bookmark _name="Cisco Systems, Inc" icon_name="i-web" uri="http://www.cisco.com"/> -+ <bookmark _name="Compaq" icon_name="i-web" uri="http://www.compaq.com"/> -+ <bookmark _name="Data Net Solutions" icon_name="i-web" uri="http://www.eclipse.com"/> -+ <bookmark _name="Dell" icon_name="i-web" uri="http://www.dell.com"/> - </folder> - <folder _name="News and Media"> -- <bookmark _name="Binary Freedom" icon_name="i-web" uri="http://www.binaryfreedom.com/"/> -- <bookmark _name="CNET Linux Center" icon_name="i-web" uri="http://linux.cnet.com/linux/0-1518529-7-3378110.html"/> -- <bookmark _name="LinuxOrbit.com" icon_name="i-web" uri="http://www.linuxorbit.com"/> -- <bookmark _name="Linux Weekly News" icon_name="i-web" uri="http://www.lwn.net"/> -+ <bookmark _name="BSD Today" icon_name="i-web" uri="http://www.bsdtoday.com"/> -+ <bookmark _name="Daily Daemon News" icon_name="i-web" uri="http://daily.daemonnews.org"/> -+ <bookmark _name="Daemon News" icon_name="i-web" uri="http://www.daemonnews.org"/> - <bookmark _name="O'Reilly" icon_name="i-web" uri="http://www.oreillynet.com"/> -- <bookmark _name="OSDN" icon_name="i-web" uri="http://www.osdn.com"/> -- <bookmark _name="ZDNet Linux Resource Center" icon_name="i-web" uri="http://linux.zdnet.com"/> - </folder> - <folder _name="Web Services"> -- <bookmark _name="CollabNet" icon_name="i-web" uri="http://www.collab.net/community/"/> -- <bookmark _name="Covalent" icon_name="i-web" uri="http://www.covalent.com"/> -- <bookmark _name="Rackspace" icon_name="i-web" uri="http://www.rackspace.com"/> -- <bookmark _name="Red Hat Network" icon_name="i-web" uri="http://www.redhat.com/network/"/> -+ <bookmark _name="FreeBSD Services, Ltd." icon_name="i-web" uri="http://www.freebsd-services.com"/> -+ <bookmark _name="JohnsCompanies Collocation Services" icon_name="i-web" uri="http://www.johncompanies.com/collocation"/> - <bookmark _name="SourceForge" icon_name="i-web" uri="http://www.sourceforge.net"/> - </folder> -- <folder _name="International"> -- <bookmark _name="Conectiva" icon_name="i-web" uri="http://en.conectiva.com/"/> -- <bookmark _name="Linux One" icon_name="i-web" uri="http://www.linuxone.co.kr/english2/eng/main.htm"/> -- <bookmark _name="Open Source Asia" icon_name="i-web" uri="http://www.opensourceasia.com"/> -- <bookmark _name="RedFlag Linux" icon_name="i-web" uri="http://www.redflag-linux.com/english/index.html"/> -- <bookmark _name="Sun Wah Linux" icon_name="i-web" uri="http://www.sw-linux.com/nonflash_front.htm"/> -- </folder> -- <folder _name="Linux Resources"> -- <bookmark _name="Debian.org" icon_name="i-web" uri="http://www.debian.org"/> -- <bookmark _name="Freshmeat.net" icon_name="i-web" uri="http://www.freshmeat.net"/> -- <bookmark _name="GNOME.org" icon_name="i-web" uri="http://www.gnome.org"/> -- <bookmark _name="GNU.org" icon_name="i-web" uri="http://www.gnu.org"/> -- <bookmark _name="Linux Online" icon_name="i-web" uri="http://www.linux.org"/> -- <bookmark _name="Linux Documentation Project" icon_name="i-web" uri="http://www.linuxdoc.org"/> -- <bookmark _name="LinuxNewbie.org" icon_name="i-web" uri="http://www.linuxnewbie.org"/> -+ <folder _name="FreeBSD Resources"> -+ <bookmark _name="BSD Apps" icon_name="i-web" uri="http://www.bsdapps.com"/> -+ <bookmark _name="BSD At Work" icon_name="i-web" uri="http://www.bsdatwork.com"/> -+ <bookmark _name="BSD Central" icon_name="i-web" uri="http://bsdcentral.com"/> -+ <bookmark _name="BSD Dev Center" icon_name="i-web" uri="http://www.onlamp.com/bsd/"/> -+ <bookmark _name="FreeBSD Diary" icon_name="i-web" uri="http://www.freebsddiary.org"/> -+ <bookmark _name="FreeBSD Forums" icon_name="i-web" uri="http://www.freebsdforums.org"/> -+ <bookmark _name="FreeBSD GNOME Project" icon_name="i-web" uri="http://www.freebsd.org/gnome"/> -+ <bookmark _name="FreeBSD Handbook" icon_name="i-web" uri="http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/index.html"/> -+ <bookmark _name="FreeBSD Security Information" icon_name="i-web" uri="http://www.freebsd.org/security/security.html"/> -+ <bookmark _name="Freshports" icon_name="i-web" uri="http://www.freshports.org"/> -+ <bookmark _name="Google's BSD Search Engine" icon_name="i-web" uri="http://www.google.com/bsd"/> - <bookmark _name="OpenOffice" icon_name="i-web" uri="http://www.openoffice.org"/> - </folder> - </bookmarks> diff --git a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in b/x11-fm/nautilus2/files/patch-libbackground_Makefile.in deleted file mode 100644 index 411fe669370f..000000000000 --- a/x11-fm/nautilus2/files/patch-libbackground_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libbackground/Makefile.in.orig Mon Aug 16 11:36:57 2004 -+++ libbackground/Makefile.in Mon Aug 16 11:37:35 2004 -@@ -171,7 +171,7 @@ - - EXTRA_DIST = ChangeLog - --INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" -DGNOME_ICONDIR=\""${datadir}/pixmaps"\" -DG_LOG_DOMAIN=\"capplet-common\" -I$(top_srcdir)/ @CAPPLET_CFLAGS@ - - - noinst_LTLIBRARIES = libbackground.la diff --git a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c b/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c deleted file mode 100644 index 68e98b1542e9..000000000000 --- a/x11-fm/nautilus2/files/patch-libnautilus-extensions::nautilus-medusa-support.c +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libnautilus-private/nautilus-medusa-support.c.orig Wed Apr 11 21:36:16 2001 -+++ libnautilus-private/nautilus-medusa-support.c Mon May 14 17:45:24 2001 -@@ -84,7 +84,7 @@ - */ - status = NAUTILUS_CRON_STATUS_OFF; - -- stat_file_name = g_strdup_printf ("/proc/%d/stat", process_number); -+ stat_file_name = g_strdup_printf ("/proc/%d/status", process_number); - stat_file = fopen (stat_file_name, "r"); - g_free (stat_file_name); - diff --git a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c b/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c deleted file mode 100644 index 5246e273c532..000000000000 --- a/x11-fm/nautilus2/files/patch-src_file-manager_fm-directory-view.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/file-manager/fm-directory-view.c.orig Tue Feb 24 08:17:24 2004 -+++ src/file-manager/fm-directory-view.c Wed Feb 25 02:43:55 2004 -@@ -4476,19 +4476,25 @@ - - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS, -- !any_scripts); -+ FALSE); - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS, -+ FALSE); -+ nautilus_bonobo_set_hidden (view->details->ui, -+ FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_PLACEHOLDER, -+ !any_scripts); -+ nautilus_bonobo_set_hidden (view->details->ui, -+ FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_PLACEHOLDER, - !any_scripts); - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS, -- !any_scripts); -+ FALSE); - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_MENU_PATH_SCRIPTS_SEPARATOR, - !any_scripts); - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_POPUP_PATH_SCRIPTS_SEPARATOR, -- !any_scripts); -+ FALSE); - nautilus_bonobo_set_hidden (view->details->ui, - FM_DIRECTORY_VIEW_POPUP_PATH_BACKGROUND_SCRIPTS_SEPARATOR, - !any_scripts); diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist index 9e283f87c5bf..926374cdc6e6 100644 --- a/x11-fm/nautilus2/pkg-plist +++ b/x11-fm/nautilus2/pkg-plist @@ -1,16 +1,6 @@ bin/nautilus +bin/nautilus-connect-server bin/nautilus-file-management-properties -include/libnautilus/libnautilus.h -include/libnautilus/nautilus-bonobo-ui.h -include/libnautilus/nautilus-clipboard.h -include/libnautilus/nautilus-distributed-undo.h -include/libnautilus/nautilus-idle-queue.h -include/libnautilus/nautilus-scroll-positionable.h -include/libnautilus/nautilus-undo-private.h -include/libnautilus/nautilus-undo.h -include/libnautilus/nautilus-view-component.h -include/libnautilus/nautilus-view-standard-main.h -include/libnautilus/nautilus-view.h include/nautilus/libnautilus-extension/nautilus-column-provider.h include/nautilus/libnautilus-extension/nautilus-column.h include/nautilus/libnautilus-extension/nautilus-extension-types.h @@ -20,52 +10,21 @@ include/nautilus/libnautilus-extension/nautilus-menu-item.h include/nautilus/libnautilus-extension/nautilus-menu-provider.h include/nautilus/libnautilus-extension/nautilus-property-page-provider.h include/nautilus/libnautilus-extension/nautilus-property-page.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/libnautilus-adapter.a -lib/libnautilus-adapter.so -lib/libnautilus-adapter.so.2 lib/libnautilus-extension.a lib/libnautilus-extension.so lib/libnautilus-extension.so.1 lib/libnautilus-private.a lib/libnautilus-private.so lib/libnautilus-private.so.2 -lib/libnautilus.a -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_emblem.server -libdata/bonobo/servers/Nautilus_View_history.server -libdata/bonobo/servers/Nautilus_View_image_properties.server -libdata/bonobo/servers/Nautilus_View_notes.server -libdata/bonobo/servers/Nautilus_View_text.server libdata/bonobo/servers/Nautilus_shell.server libdata/pkgconfig/libnautilus-extension.pc -libdata/pkgconfig/libnautilus.pc -libexec/nautilus-adapter -libexec/nautilus-text-view -libexec/nautilus-throbber share/gnome/applications/nautilus-computer.desktop +share/gnome/applications/nautilus-file-management-properties.desktop +share/gnome/applications/nautilus-folder-handler.desktop share/gnome/applications/nautilus-home.desktop share/gnome/applications/nautilus.desktop share/gnome/applications/network-scheme.desktop -share/gnome/control-center-2.0/capplets/nautilus-file-management-properties.desktop -share/gnome/gnome-2.0/ui/nautilus-clipboard-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-list-view-ui.xml -share/gnome/gnome-2.0/ui/nautilus-navigation-window-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-spatial-window-ui.xml -share/gnome/gnome-2.0/ui/nautilus-text-view-ui.xml -share/gnome/idl/nautilus-distributed-undo.idl -share/gnome/idl/nautilus-view-component.idl +@exec update-desktop-database > /dev/null || /usr/bin/true share/gnome/nautilus/browser.xml share/gnome/nautilus/glade/nautilus-bookmarks-window.glade share/gnome/nautilus/glade/nautilus-file-management-properties.glade @@ -103,7 +62,13 @@ share/gnome/nautilus/patterns/snow_ridge.png share/gnome/nautilus/patterns/stucco.jpg share/gnome/nautilus/patterns/terracotta.png share/gnome/nautilus/patterns/wavy_white.png -share/gnome/nautilus/static_bookmarks.xml +share/gnome/nautilus/ui/nautilus-desktop-icon-view-ui.xml +share/gnome/nautilus/ui/nautilus-directory-view-ui.xml +share/gnome/nautilus/ui/nautilus-icon-view-ui.xml +share/gnome/nautilus/ui/nautilus-list-view-ui.xml +share/gnome/nautilus/ui/nautilus-navigation-window-ui.xml +share/gnome/nautilus/ui/nautilus-shell-ui.xml +share/gnome/nautilus/ui/nautilus-spatial-window-ui.xml share/gnome/pixmaps/nautilus/Search.png share/gnome/pixmaps/nautilus/audio.png share/gnome/pixmaps/nautilus/backgrounds.png @@ -181,6 +146,7 @@ share/locale/ne/LC_MESSAGES/nautilus.mo share/locale/nl/LC_MESSAGES/nautilus.mo share/locale/nn/LC_MESSAGES/nautilus.mo share/locale/no/LC_MESSAGES/nautilus.mo +share/locale/nso/LC_MESSAGES/nautilus.mo share/locale/pa/LC_MESSAGES/nautilus.mo share/locale/pl/LC_MESSAGES/nautilus.mo share/locale/pt/LC_MESSAGES/nautilus.mo @@ -204,6 +170,7 @@ share/locale/wa/LC_MESSAGES/nautilus.mo share/locale/yi/LC_MESSAGES/nautilus.mo share/locale/zh_CN/LC_MESSAGES/nautilus.mo share/locale/zh_TW/LC_MESSAGES/nautilus.mo +share/locale/zu/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/tahoe @dirrm share/gnome/pixmaps/nautilus/sierra @dirrm share/gnome/pixmaps/nautilus/gnome @@ -211,12 +178,13 @@ share/locale/zh_TW/LC_MESSAGES/nautilus.mo @dirrm share/gnome/pixmaps/nautilus/crux_teal @dirrm share/gnome/pixmaps/nautilus/crux_eggplant @dirrm share/gnome/pixmaps/nautilus +@dirrm share/gnome/nautilus/ui @dirrm share/gnome/nautilus/patterns @dirrm share/gnome/nautilus/glade @dirrm share/gnome/nautilus @dirrm include/nautilus/libnautilus-extension @dirrm include/nautilus -@dirrm include/libnautilus @exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0 @unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true +@unexec update-desktop-database > /dev/null || /usr/bin/true diff --git a/x11-themes/Makefile b/x11-themes/Makefile index 1f3d64b5a88e..ec0564ba0f4f 100644 --- a/x11-themes/Makefile +++ b/x11-themes/Makefile @@ -19,6 +19,7 @@ SUBDIR += fluxbox-sid-pack SUBDIR += fvwm-themes SUBDIR += geramik + SUBDIR += gnome-backgrounds SUBDIR += gnome-icons SUBDIR += gnome-icons-aqua-fusion SUBDIR += gnome-icons-cool-gorilla diff --git a/x11-themes/gnome-backgrounds/Makefile b/x11-themes/gnome-backgrounds/Makefile new file mode 100644 index 000000000000..66770804d01d --- /dev/null +++ b/x11-themes/gnome-backgrounds/Makefile @@ -0,0 +1,26 @@ +# New ports collection makefile for: gnome-backgrounds +# Date Created: 12 January 2005 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnome-backgrounds +PORTVERSION= 2.10.0 +CATEGORIES= x11-themes graphics gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= A collection of backgrounds for GNOME 2 + +USE_BZIP2= yes +USE_X_PREFIX= yes +GNU_CONFIGURE= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnometarget gnomehack intlhack +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +.include <bsd.port.mk> diff --git a/x11-themes/gnome-backgrounds/distinfo b/x11-themes/gnome-backgrounds/distinfo new file mode 100644 index 000000000000..8708131ef844 --- /dev/null +++ b/x11-themes/gnome-backgrounds/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/gnome-backgrounds-2.10.0.tar.bz2) = 8b4a3f293555c29d2a9e8bfd6d0014ba +SIZE (gnome2/gnome-backgrounds-2.10.0.tar.bz2) = 2249259 diff --git a/x11-themes/gnome-backgrounds/pkg-descr b/x11-themes/gnome-backgrounds/pkg-descr new file mode 100644 index 000000000000..bd5054b85e24 --- /dev/null +++ b/x11-themes/gnome-backgrounds/pkg-descr @@ -0,0 +1 @@ +This module contains a set of backgrounds packaged with the GNOME desktop. diff --git a/x11-themes/gnome-backgrounds/pkg-plist b/x11-themes/gnome-backgrounds/pkg-plist new file mode 100644 index 000000000000..bb493f890e2a --- /dev/null +++ b/x11-themes/gnome-backgrounds/pkg-plist @@ -0,0 +1,58 @@ +share/gnome/gnome-background-properties/gnome-branded.xml +share/gnome/gnome-background-properties/gnome-tiles.xml +share/gnome/gnome-background-properties/gnome-translucent.xml +share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Aqua.jpg +share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-FraserIsland.jpg +share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Redblurred.jpg +share/gnome/pixmaps/backgrounds/gnome/branded/GNOME-Weirdcolours.jpg +share/gnome/pixmaps/backgrounds/gnome/tiles/alien-artifact-trans.png +share/gnome/pixmaps/backgrounds/gnome/tiles/cow-trans.png +share/gnome/pixmaps/backgrounds/gnome/tiles/tiles-trans.png +share/gnome/pixmaps/backgrounds/gnome/translucent/ellipsis.png +share/gnome/pixmaps/backgrounds/gnome/translucent/rects.png +share/gnome/pixmaps/backgrounds/gnome/translucent/tentacles.png +share/locale/ar/LC_MESSAGES/gnome-backgrounds.mo +share/locale/bg/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ca/LC_MESSAGES/gnome-backgrounds.mo +share/locale/cs/LC_MESSAGES/gnome-backgrounds.mo +share/locale/cy/LC_MESSAGES/gnome-backgrounds.mo +share/locale/da/LC_MESSAGES/gnome-backgrounds.mo +share/locale/de/LC_MESSAGES/gnome-backgrounds.mo +share/locale/el/LC_MESSAGES/gnome-backgrounds.mo +share/locale/en_CA/LC_MESSAGES/gnome-backgrounds.mo +share/locale/en_GB/LC_MESSAGES/gnome-backgrounds.mo +share/locale/es/LC_MESSAGES/gnome-backgrounds.mo +share/locale/fi/LC_MESSAGES/gnome-backgrounds.mo +share/locale/fr/LC_MESSAGES/gnome-backgrounds.mo +share/locale/gu/LC_MESSAGES/gnome-backgrounds.mo +share/locale/hi/LC_MESSAGES/gnome-backgrounds.mo +share/locale/hu/LC_MESSAGES/gnome-backgrounds.mo +share/locale/id/LC_MESSAGES/gnome-backgrounds.mo +share/locale/it/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ja/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ko/LC_MESSAGES/gnome-backgrounds.mo +share/locale/lt/LC_MESSAGES/gnome-backgrounds.mo +share/locale/nb/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ne/LC_MESSAGES/gnome-backgrounds.mo +share/locale/nl/LC_MESSAGES/gnome-backgrounds.mo +share/locale/no/LC_MESSAGES/gnome-backgrounds.mo +share/locale/pa/LC_MESSAGES/gnome-backgrounds.mo +share/locale/pl/LC_MESSAGES/gnome-backgrounds.mo +share/locale/pt/LC_MESSAGES/gnome-backgrounds.mo +share/locale/pt_BR/LC_MESSAGES/gnome-backgrounds.mo +share/locale/ro/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sk/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sq/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sr/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-backgrounds.mo +share/locale/sv/LC_MESSAGES/gnome-backgrounds.mo +share/locale/uk/LC_MESSAGES/gnome-backgrounds.mo +share/locale/vi/LC_MESSAGES/gnome-backgrounds.mo +share/locale/zh_CN/LC_MESSAGES/gnome-backgrounds.mo +share/locale/zh_TW/LC_MESSAGES/gnome-backgrounds.mo +@dirrm share/gnome/pixmaps/backgrounds/gnome/translucent +@dirrm share/gnome/pixmaps/backgrounds/gnome/tiles +@dirrm share/gnome/pixmaps/backgrounds/gnome/branded +@dirrm share/gnome/pixmaps/backgrounds/gnome +@dirrm share/gnome/pixmaps/backgrounds +@dirrm share/gnome/gnome-background-properties diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index 3adc130da95d..288f4b47fc2a 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnome-themes -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11-themes gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,8 +18,6 @@ COMMENT= A collection of themes and icons for GNOME2 designed for accessibility BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-themes/gtk-engines2 -CONFLICTS= gtk-smooth-engine-[0-9]* - USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes diff --git a/x11-themes/gnome-themes/distinfo b/x11-themes/gnome-themes/distinfo index 701cd2589e46..9e8a13a0bdf1 100644 --- a/x11-themes/gnome-themes/distinfo +++ b/x11-themes/gnome-themes/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-themes-2.8.2.tar.bz2) = 822899efe7170ca59e04144d94d85741 -SIZE (gnome2/gnome-themes-2.8.2.tar.bz2) = 2716583 +MD5 (gnome2/gnome-themes-2.10.0.tar.bz2) = daa8b0a35f425ad442c950d615c026af +SIZE (gnome2/gnome-themes-2.10.0.tar.bz2) = 2569321 diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c b/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c deleted file mode 100644 index 7813ce91f8a5..000000000000 --- a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-pixmaps.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk-themes/Crux/src/crux-pixmaps.c.orig Thu Oct 16 21:01:59 2003 -+++ gtk-themes/Crux/src/crux-pixmaps.c Thu Oct 16 21:02:17 2003 -@@ -340,9 +340,10 @@ - { - GdkPixbuf *pixbuf; - size_t len = strlen (*path) + strlen (file) + 2; -- char *buf = alloca (len); -+ char *buf = g_malloc (len); - sprintf (buf, "%s/%s", *path, file); - pixbuf = gdk_pixbuf_new_from_file (buf, NULL); -+ g_free (buf); - if (pixbuf != 0) - return pixbuf; - path++; diff --git a/x11-themes/gnome-themes/pkg-plist b/x11-themes/gnome-themes/pkg-plist index 7c36575ba44a..b7999567f405 100644 --- a/x11-themes/gnome-themes/pkg-plist +++ b/x11-themes/gnome-themes/pkg-plist @@ -1,84 +1,3 @@ -lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.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/Glider/metacity-1/metacity-theme-1.xml share/gnome/themes/Mist/metacity-1/metacity-theme-1.xml share/gnome/themes/Sandwish/metacity-1/active-border-top-left-border.png @@ -249,6 +168,7 @@ share/icons/HighContrastLargePrint/48x48/apps/administration.png share/icons/HighContrastLargePrint/48x48/apps/advanced-directory.png share/icons/HighContrastLargePrint/48x48/apps/ax-applet.png share/icons/HighContrastLargePrint/48x48/apps/charpick.png +share/icons/HighContrastLargePrint/48x48/apps/clock.png share/icons/HighContrastLargePrint/48x48/apps/config-language.png share/icons/HighContrastLargePrint/48x48/apps/config-users.png share/icons/HighContrastLargePrint/48x48/apps/config-xfree.png @@ -281,7 +201,6 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-ccscreensaver.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrint/48x48/apps/gnome-character-map.png -share/icons/HighContrastLargePrint/48x48/apps/gnome-clock.png share/icons/HighContrastLargePrint/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrint/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-eog.png @@ -320,7 +239,12 @@ share/icons/HighContrastLargePrint/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrint/48x48/apps/gnome-pdf.png share/icons/HighContrastLargePrint/48x48/apps/gnome-planner.png share/icons/HighContrastLargePrint/48x48/apps/gnome-remote-desktop.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-run.png share/icons/HighContrastLargePrint/48x48/apps/gnome-screensaver.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-screenshot.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png +share/icons/HighContrastLargePrint/48x48/apps/gnome-searchtool-animation.png share/icons/HighContrastLargePrint/48x48/apps/gnome-server-config.png share/icons/HighContrastLargePrint/48x48/apps/gnome-session.png share/icons/HighContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png @@ -609,10 +533,11 @@ share/icons/HighContrastLargePrint/index.theme share/icons/HighContrastLargePrintInverse/48x48/apps/JUSimageIcon.png share/icons/HighContrastLargePrintInverse/48x48/apps/accessibility-directory.png share/icons/HighContrastLargePrintInverse/48x48/apps/acme-48.png -share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png share/icons/HighContrastLargePrintInverse/48x48/apps/administration.png +share/icons/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png share/icons/HighContrastLargePrintInverse/48x48/apps/ax-applet.png share/icons/HighContrastLargePrintInverse/48x48/apps/charpick.png +share/icons/HighContrastLargePrintInverse/48x48/apps/clock.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-language.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-users.png share/icons/HighContrastLargePrintInverse/48x48/apps/config-xfree.png @@ -635,8 +560,8 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/glade-2.png share/icons/HighContrastLargePrintInverse/48x48/apps/glines.png share/icons/HighContrastLargePrintInverse/48x48/apps/glow.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnect-icon.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-application-generic.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-applications.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-audio2.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-blackjack.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-calc3.png @@ -645,7 +570,6 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-ccscreensaver.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cd.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-cdplayer-icon.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-character-map.png -share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-clock.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-desktop-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-devel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-eog.png @@ -684,7 +608,12 @@ share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-panel.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-pdf.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-planner.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-remote-desktop.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-run.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screensaver.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-screenshot.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation-rest.png +share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-searchtool-animation.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-server-config.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-session.png share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-settings-accessibility-keyboard.png @@ -976,6 +905,7 @@ share/icons/LowContrastLargePrint/48x48/apps/accessibility-directory.png share/icons/LowContrastLargePrint/48x48/apps/advanced-directory.png share/icons/LowContrastLargePrint/48x48/apps/ax-applet.png share/icons/LowContrastLargePrint/48x48/apps/charpick.png +share/icons/LowContrastLargePrint/48x48/apps/clock.png share/icons/LowContrastLargePrint/48x48/apps/display-capplet.png share/icons/LowContrastLargePrint/48x48/apps/file-manager.png share/icons/LowContrastLargePrint/48x48/apps/file-roller.png @@ -991,7 +921,6 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-ccscreensaver.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cd.png share/icons/LowContrastLargePrint/48x48/apps/gnome-cdplayer-icon.png share/icons/LowContrastLargePrint/48x48/apps/gnome-character-map.png -share/icons/LowContrastLargePrint/48x48/apps/gnome-clock.png share/icons/LowContrastLargePrint/48x48/apps/gnome-devel.png share/icons/LowContrastLargePrint/48x48/apps/gnome-eog.png share/icons/LowContrastLargePrint/48x48/apps/gnome-ghex.png @@ -1011,6 +940,11 @@ share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer-applet.png share/icons/LowContrastLargePrint/48x48/apps/gnome-mixer.png share/icons/LowContrastLargePrint/48x48/apps/gnome-multimedia.png share/icons/LowContrastLargePrint/48x48/apps/gnome-panel.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-run.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-screenshot.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation-rest.png +share/icons/LowContrastLargePrint/48x48/apps/gnome-searchtool-animation.png share/icons/LowContrastLargePrint/48x48/apps/gnome-session.png share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-keyboard.png share/icons/LowContrastLargePrint/48x48/apps/gnome-settings-accessibility-technologies.png @@ -1233,24 +1167,25 @@ 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/64x64/filesystems/gnome-fs-directory.png +share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty-accept.png +share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-empty.png +share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full-accept.png +share/icons/Smokey-Blue/64x64/filesystems/gnome-fs-trash-full.png +share/icons/Smokey-Blue/72x72/filesystems/gnome-fs-directory.png +share/icons/Smokey-Blue/96x96/filesystems/gnome-fs-directory.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/64x64/filesystems/gnome-fs-directory.icon +share/icons/Smokey-Red/64x64/filesystems/gnome-fs-directory.png +share/icons/Smokey-Red/64x64/filesystems/gnome-fs-nfs.png +share/icons/Smokey-Red/72x72/filesystems/gnome-fs-directory.png +share/icons/Smokey-Red/96x96/filesystems/gnome-fs-directory.png share/icons/Smokey-Red/index.theme share/locale/am/LC_MESSAGES/gnome-themes.mo share/locale/ar/LC_MESSAGES/gnome-themes.mo @@ -1292,6 +1227,7 @@ share/locale/ml/LC_MESSAGES/gnome-themes.mo share/locale/mn/LC_MESSAGES/gnome-themes.mo share/locale/ms/LC_MESSAGES/gnome-themes.mo share/locale/nb/LC_MESSAGES/gnome-themes.mo +share/locale/ne/LC_MESSAGES/gnome-themes.mo share/locale/nl/LC_MESSAGES/gnome-themes.mo share/locale/nn/LC_MESSAGES/gnome-themes.mo share/locale/no/LC_MESSAGES/gnome-themes.mo @@ -1315,22 +1251,8 @@ share/locale/vi/LC_MESSAGES/gnome-themes.mo share/locale/wa/LC_MESSAGES/gnome-themes.mo share/locale/zh_CN/LC_MESSAGES/gnome-themes.mo share/locale/zh_TW/LC_MESSAGES/gnome-themes.mo -share/themes/Crux/gtk-2.0/gtkrc share/themes/Crux/index.theme share/themes/Glider/gtk-2.0/gtkrc -share/themes/Glider/gtk-2.0/iconrc -share/themes/Glider/gtk-2.0/stock_apply.png -share/themes/Glider/gtk-2.0/stock_bottom.png -share/themes/Glider/gtk-2.0/stock_cancel.png -share/themes/Glider/gtk-2.0/stock_down.png -share/themes/Glider/gtk-2.0/stock_first.png -share/themes/Glider/gtk-2.0/stock_last.png -share/themes/Glider/gtk-2.0/stock_left.png -share/themes/Glider/gtk-2.0/stock_ok.png -share/themes/Glider/gtk-2.0/stock_refresh.png -share/themes/Glider/gtk-2.0/stock_right.png -share/themes/Glider/gtk-2.0/stock_top.png -share/themes/Glider/gtk-2.0/stock_up.png share/themes/Glider/index.theme share/themes/Grand-Canyon/gtk-2.0/3d_all_flat.png share/themes/Grand-Canyon/gtk-2.0/3d_all_normal.png @@ -1784,7 +1706,6 @@ 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.disabled share/themes/LowContrastLargePrint/gtk-2.0/gtkrc @@ -1924,7 +1845,6 @@ 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 @@ -1952,25 +1872,19 @@ 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/ThinIce/gtk-2.0/gtkrc share/themes/Traditional/index.theme @dirrm share/themes/Traditional -@dirrm share/themes/ThinIce/gtk-2.0 -@dirrm share/themes/ThinIce @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 @@ -1988,13 +1902,23 @@ share/themes/Traditional/index.theme @dirrm share/themes/Grand-Canyon @dirrm share/themes/Glider/gtk-2.0 @dirrm share/themes/Glider -@dirrm share/themes/Crux/gtk-2.0 @dirrm share/themes/Crux +@dirrm share/icons/Smokey-Red/96x96/filesystems +@dirrm share/icons/Smokey-Red/96x96 +@dirrm share/icons/Smokey-Red/72x72/filesystems +@dirrm share/icons/Smokey-Red/72x72 +@dirrm share/icons/Smokey-Red/64x64/filesystems +@dirrm share/icons/Smokey-Red/64x64 @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/96x96/filesystems +@dirrm share/icons/Smokey-Blue/96x96 +@dirrm share/icons/Smokey-Blue/72x72/filesystems +@dirrm share/icons/Smokey-Blue/72x72 +@dirrm share/icons/Smokey-Blue/64x64/filesystems +@dirrm share/icons/Smokey-Blue/64x64 @dirrm share/icons/Smokey-Blue/48x48/emblems @dirrm share/icons/Smokey-Blue/48x48 @dirrm share/icons/Smokey-Blue @@ -2089,5 +2013,4 @@ share/themes/Traditional/index.theme @dirrm share/gnome/themes/Mist @dirrm share/gnome/themes/Glider/metacity-1 @dirrm share/gnome/themes/Glider -@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 f38c53bb4745..ce8640dfc4c4 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -6,30 +6,28 @@ # PORTNAME= gtk-engines2 -PORTVERSION= 2.2.0 -PORTREVISION= 6 +PORTVERSION= 2.6.2 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.6 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Theme engine for the gtk+-2.0 toolkit +CONFLICTS= gtk-smooth-engine-[0-9]* + USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_LIBTOOL_VER=15 USE_GNOME= gnomehack gtk20 PLIST_SUB= GTK_VERSION="2.4.0" -THEMES= metal redmond95 - +# Disable the gtk1 theme. post-patch: - @for theme in ${THEMES}; do \ - cd ${WRKSRC}/$$theme/Theme/gtk-2.0; \ - ${MV} gtkrc gtkrc.tmp; \ - ${SED} -e s^%%PREFIX%%^${PREFIX}^g < gtkrc.tmp > gtkrc; \ - done + @${REINPLACE_CMD} -e 's|gtk gtk-2.0|gtk-2.0|' \ + ${WRKSRC}/themes/Redmond/Makefile.in .include <bsd.port.mk> diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index c1a36b1eebbf..39e695fd0838 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gtk-engines-2.2.0.tar.bz2) = 78e9276c28b509f3203de4873c20a263 -SIZE (gnome2/gtk-engines-2.2.0.tar.bz2) = 401883 +MD5 (gnome2/gtk-engines-2.6.2.tar.bz2) = 11f9a1dcabf002aa904facac4293c1fd +SIZE (gnome2/gtk-engines-2.6.2.tar.bz2) = 444092 diff --git a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c index 9111a7ac593f..ec5a85340f62 100644 --- a/x11-themes/gnome-themes/files/patch-gtk-themes_Crux_src_crux-gradient.c +++ b/x11-themes/gtk-engines2/files/patch-engines_crux_src_crux-gradient.c @@ -1,5 +1,5 @@ ---- gtk-themes/Crux/src/crux-gradient.c.orig Thu Oct 16 20:57:05 2003 -+++ gtk-themes/Crux/src/crux-gradient.c Thu Oct 16 21:01:18 2003 +--- engines/crux/src/crux-gradient.c.orig Thu Oct 16 20:57:05 2003 ++++ engines/crux/src/crux-gradient.c Thu Oct 16 21:01:18 2003 @@ -207,7 +207,7 @@ const eazel_engine_gradient *gradient) { diff --git a/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c new file mode 100644 index 000000000000..f545a6a65ec5 --- /dev/null +++ b/x11-themes/gtk-engines2/files/patch-engines_industrial_src_industrial_style.c @@ -0,0 +1,10 @@ +--- engines/industrial/src/industrial_style.c.orig Tue Mar 16 16:55:11 2004 ++++ engines/industrial/src/industrial_style.c Tue Mar 16 16:58:23 2004 +@@ -1801,6 +1801,7 @@ + gint width, + gint height) + { ++ g_return_if_fail (widget != NULL); + #if DEBUG + printf ("draw_shadow: %p %p %s %i %i %i %i\n", widget, window, detail, x, y, + width, height); diff --git a/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c b/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c deleted file mode 100644 index 7d26e2d451bf..000000000000 --- a/x11-themes/gtk-engines2/files/patch-pixbuf_pixbuf-draw.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pixbuf/pixbuf-draw.c.orig Mon Aug 23 11:59:28 2004 -+++ pixbuf/pixbuf-draw.c Mon Aug 23 12:00:13 2004 -@@ -75,7 +75,7 @@ - continue; - - if (image->match_data.detail && -- (!image->match_data.detail || -+ (!match_data->detail || - strcmp (match_data->detail, image->match_data.detail) != 0)) - continue; - diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 5f867a912e1c..9d469f0d6c79 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -1,12 +1,107 @@ +lib/gtk-2.0/%%GTK_VERSION%%/engines/libcrux-engine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libhcengine.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libindustrial.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/liblighthouseblue.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libmetal.so -lib/gtk-2.0/%%GTK_VERSION%%/engines/libpixmap.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libmist.so lib/gtk-2.0/%%GTK_VERSION%%/engines/libredmond95.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libsmooth.so +lib/gtk-2.0/%%GTK_VERSION%%/engines/libthinice.so libdata/pkgconfig/gtk-engines-2.pc -share/themes/Metal/README.html +share/themes/Crux/gtk-2.0/gtkrc +share/themes/Crux/pixmaps/arrow_down-spinner.png +share/themes/Crux/pixmaps/arrow_down.png +share/themes/Crux/pixmaps/arrow_left.png +share/themes/Crux/pixmaps/arrow_right.png +share/themes/Crux/pixmaps/arrow_up-spinner.png +share/themes/Crux/pixmaps/arrow_up.png +share/themes/Crux/pixmaps/check-active-default-focus.png +share/themes/Crux/pixmaps/check-active-default.png +share/themes/Crux/pixmaps/check-active-hilight-focus.png +share/themes/Crux/pixmaps/check-active-hilight.png +share/themes/Crux/pixmaps/check-active-insensitive.png +share/themes/Crux/pixmaps/check-active-pressed-focus.png +share/themes/Crux/pixmaps/check-active-pressed.png +share/themes/Crux/pixmaps/check-default-focus.png +share/themes/Crux/pixmaps/check-default.png +share/themes/Crux/pixmaps/check-hilight-focus.png +share/themes/Crux/pixmaps/check-hilight.png +share/themes/Crux/pixmaps/check-insensitive.png +share/themes/Crux/pixmaps/check-pressed-focus.png +share/themes/Crux/pixmaps/check-pressed.png +share/themes/Crux/pixmaps/progressbar-left.png +share/themes/Crux/pixmaps/progressbar-right.png +share/themes/Crux/pixmaps/progressbar.png +share/themes/Crux/pixmaps/progressbar_trough.png +share/themes/Crux/pixmaps/radio-active-default-focus.png +share/themes/Crux/pixmaps/radio-active-default.png +share/themes/Crux/pixmaps/radio-active-hilight-focus.png +share/themes/Crux/pixmaps/radio-active-hilight.png +share/themes/Crux/pixmaps/radio-active-insensitive.png +share/themes/Crux/pixmaps/radio-active-pressed-focus.png +share/themes/Crux/pixmaps/radio-active-pressed.png +share/themes/Crux/pixmaps/radio-default-focus.png +share/themes/Crux/pixmaps/radio-default.png +share/themes/Crux/pixmaps/radio-hilight-focus.png +share/themes/Crux/pixmaps/radio-hilight.png +share/themes/Crux/pixmaps/radio-insensitive.png +share/themes/Crux/pixmaps/radio-pressed-focus.png +share/themes/Crux/pixmaps/radio-pressed.png +share/themes/Crux/pixmaps/scroller-arrow-down-hilight.png +share/themes/Crux/pixmaps/scroller-arrow-down-pressed.png +share/themes/Crux/pixmaps/scroller-arrow-down.png +share/themes/Crux/pixmaps/scroller-arrow-left-hilight.png +share/themes/Crux/pixmaps/scroller-arrow-left-pressed.png +share/themes/Crux/pixmaps/scroller-arrow-left.png +share/themes/Crux/pixmaps/scroller-arrow-right-hilight.png +share/themes/Crux/pixmaps/scroller-arrow-right-pressed.png +share/themes/Crux/pixmaps/scroller-arrow-right.png +share/themes/Crux/pixmaps/scroller-arrow-up-hilight.png +share/themes/Crux/pixmaps/scroller-arrow-up-pressed.png +share/themes/Crux/pixmaps/scroller-arrow-up.png +share/themes/Crux/pixmaps/scroller-h-hilight.png +share/themes/Crux/pixmaps/scroller-h-thumb-hilight.png +share/themes/Crux/pixmaps/scroller-h-thumb.png +share/themes/Crux/pixmaps/scroller-h-trough.png +share/themes/Crux/pixmaps/scroller-h.png +share/themes/Crux/pixmaps/scroller-v-hilight.png +share/themes/Crux/pixmaps/scroller-v-thumb-hilight.png +share/themes/Crux/pixmaps/scroller-v-thumb.png +share/themes/Crux/pixmaps/scroller-v-trough.png +share/themes/Crux/pixmaps/scroller-v.png +share/themes/Crux/pixmaps/slider_h_thumb.png +share/themes/Crux/pixmaps/slider_h_trough.png +share/themes/Crux/pixmaps/slider_h_trough_focus.png +share/themes/Crux/pixmaps/slider_v_thumb.png +share/themes/Crux/pixmaps/slider_v_trough.png +share/themes/Crux/pixmaps/slider_v_trough_focus.png +share/themes/Crux/pixmaps/tab_left-unsel.png +share/themes/Crux/pixmaps/tab_left.png +share/themes/Crux/pixmaps/tab_right.png +share/themes/Crux/pixmaps/tab_sel-bottom.png +share/themes/Crux/pixmaps/tab_sel.png +share/themes/Crux/pixmaps/tab_usel-bottom-left.png +share/themes/Crux/pixmaps/tab_usel-bottom.png +share/themes/Crux/pixmaps/tab_usel-left.png +share/themes/Crux/pixmaps/tab_usel.png +share/themes/Industrial/gtk-2.0/gtkrc +share/themes/LighthouseBlue/gtk-2.0/gtkrc share/themes/Metal/gtk-2.0/gtkrc -share/themes/Redmond95/README.html -share/themes/Redmond95/gtk-2.0/gtkrc -@dirrm share/themes/Redmond95/gtk-2.0 +share/themes/Mist/gtk-2.0/gtkrc +share/themes/Redmond/gtk-2.0/gtkrc +share/themes/ThinIce/gtk-2.0/gtkrc +@dirrm share/themes/ThinIce/gtk-2.0 +@dirrm share/themes/Redmond/gtk-2.0 +@dirrm share/themes/Mist/gtk-2.0 @dirrm share/themes/Metal/gtk-2.0 -@unexec /bin/rmdir %D/share/themes/Redmond95 2>/dev/null || /usr/bin/true +@dirrm share/themes/LighthouseBlue/gtk-2.0 +@dirrm share/themes/Industrial/gtk-2.0 +@dirrm share/themes/Crux/pixmaps +@dirrm share/themes/Crux/gtk-2.0 +@unexec /bin/rmdir %D/share/themes/ThinIce 2>/dev/null || true +@unexec /bin/rmdir %D/share/themes/Redmond 2>/dev/null || true +@unexec /bin/rmdir %D/share/themes/Mist 2>/dev/null || true @unexec /bin/rmdir %D/share/themes/Metal 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/themes/LighthouseBlue 2>/dev/null || true +@unexec /bin/rmdir %D/share/themes/Industrial 2>/dev/null || true +@unexec /bin/rmdir %D/share/themes/Crux 2>/dev/null || true diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index c6650ed0abba..5a1d65aab4ff 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -6,10 +6,10 @@ # PORTNAME= eel -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -18,7 +18,8 @@ COMMENT= Generally useful classes and extensions to GNOME USE_BZIP2= yes USE_GMAKE= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier gnomevfs2 gail libgnomeui +GNOME_DESKTOP_VERSION=2 +USE_GNOME= gnomeprefix gnomehack gail gnomedesktop gnomemenus USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/eel/distinfo b/x11-toolkits/eel/distinfo index 43f56ccf9a21..07b79adb5b02 100644 --- a/x11-toolkits/eel/distinfo +++ b/x11-toolkits/eel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/eel-2.8.2.tar.bz2) = 4d0beb2f0ad4c304b49c06b08d0a03e5 -SIZE (gnome2/eel-2.8.2.tar.bz2) = 620939 +MD5 (gnome2/eel-2.10.0.tar.bz2) = 465cd522fabfed5668e70d7eae5f99e0 +SIZE (gnome2/eel-2.10.0.tar.bz2) = 665666 diff --git a/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c b/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c deleted file mode 100644 index a71c0f102a7b..000000000000 --- a/x11-toolkits/eel/files/patch-eel::eel-vfs-extensions.c +++ /dev/null @@ -1,15 +0,0 @@ - -$FreeBSD$ - ---- eel/eel-vfs-extensions.c 2001/12/20 13:41:21 1.1 -+++ eel/eel-vfs-extensions.c 2001/12/20 13:47:36 -@@ -116,7 +116,8 @@ - - /* Return the file. */ - *file_size = total_bytes_read; -- *file_contents = g_realloc (buffer, total_bytes_read); -+ *file_contents = g_realloc (buffer, total_bytes_read + 1); -+ (*file_contents)[total_bytes_read] = '\0'; - return GNOME_VFS_OK; - } - diff --git a/x11-toolkits/eel/pkg-plist b/x11-toolkits/eel/pkg-plist index 6af5ffaa2fa3..1351ff956af1 100644 --- a/x11-toolkits/eel/pkg-plist +++ b/x11-toolkits/eel/pkg-plist @@ -46,7 +46,7 @@ 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.10 +lib/libeel-2.so.12 libdata/pkgconfig/eel-2.0.pc share/locale/am/LC_MESSAGES/eel-2.0.mo share/locale/ang/LC_MESSAGES/eel-2.0.mo @@ -118,5 +118,7 @@ share/locale/vi/LC_MESSAGES/eel-2.0.mo share/locale/wa/LC_MESSAGES/eel-2.0.mo share/locale/zh_CN/LC_MESSAGES/eel-2.0.mo share/locale/zh_TW/LC_MESSAGES/eel-2.0.mo +@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ang 2> /dev/null || true @dirrm include/eel-2/eel @dirrm include/eel-2 diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 725f935a6428..4a68461fcfce 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gal2 -PORTVERSION= 2.2.5 +PORTVERSION= 2.4.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.2 +MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.4 DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -18,16 +18,26 @@ COMMENT= A collection of widgets taken from GNOME 2 gnumeric USE_BZIP2= yes USE_X_PREFIX= yes +USE_REINPLACE= yes USE_PERL5= yes USE_GMAKE= yes -USE_GNOME= gnomehack gnomeprefix gnomehier intlhack \ - libgnomeui libgnomeprintui +USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui INSTALLS_SHLIB= yes USE_LIBTOOL_VER=15 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -PLIST_SUB= VERSION="2.2" PORTVERSION=${PORTVERSION} +PLIST_SUB= VERSION="2.4" PORTVERSION=${PORTVERSION} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +post-patch: +.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ + ( ${OSVERSION} < 503101 ) +.for po in da.po it.po zh_CN.po + @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} +.endfor +.endif + +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gal2/distinfo b/x11-toolkits/gal2/distinfo index 21f4dd3ebea6..968e15ec11db 100644 --- a/x11-toolkits/gal2/distinfo +++ b/x11-toolkits/gal2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gal-2.2.5.tar.bz2) = a3face85eb306dffd773fe8812912882 -SIZE (gnome2/gal-2.2.5.tar.bz2) = 1160976 +MD5 (gnome2/gal-2.4.0.tar.bz2) = ce94075fa92400328ff02d7b8f3c7f3a +SIZE (gnome2/gal-2.4.0.tar.bz2) = 1195949 diff --git a/x11-toolkits/gal2/files/patch-ab b/x11-toolkits/gal2/files/patch-ab index 53fe2cc71565..6555fe4ac75a 100644 --- a/x11-toolkits/gal2/files/patch-ab +++ b/x11-toolkits/gal2/files/patch-ab @@ -1,11 +1,11 @@ ---- Makefile.in.orig Fri Jun 4 17:24:13 2004 -+++ Makefile.in Fri Jun 4 17:25:02 2004 -@@ -145,7 +145,7 @@ - am__quote = @am__quote@ - gnomelocaledir = @gnomelocaledir@ - install_sh = @install_sh@ +--- Makefile.in.orig Tue Nov 2 02:03:06 2004 ++++ Makefile.in Tue Nov 2 02:03:16 2004 +@@ -197,7 +197,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ -SUBDIRS = po gal tests docs art +SUBDIRS = po gal docs art - pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = gal-2.2.pc + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = \ diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c new file mode 100644 index 000000000000..f1ad3a4502de --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-text.c @@ -0,0 +1,30 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-text.c.orig Wed Feb 9 23:01:26 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-text.c Wed Feb 9 23:02:02 2005 +@@ -152,11 +152,12 @@ + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gunichar ret_val; + gchar *at_offset; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + at_offset = g_utf8_offset_to_pointer (full_text, offset); + ret_val = g_utf8_get_char_validated (at_offset, -1); + g_free (full_text); +@@ -236,11 +237,12 @@ + { + GalA11yECell *gaec = GAL_A11Y_E_CELL (text); + gint ret_val; ++ gchar *full_text; + + if (!ect_check (text)) + return -1; + +- gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); ++ full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row); + + ret_val = g_utf8_strlen (full_text, -1); + g_free (full_text); diff --git a/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c new file mode 100644 index 000000000000..cfde6c47c47b --- /dev/null +++ b/x11-toolkits/gal2/files/patch-gal_a11y_e-table_gal-a11y-e-cell-vbox.c @@ -0,0 +1,46 @@ +--- gal/a11y/e-table/gal-a11y-e-cell-vbox.c.orig Wed Feb 9 23:03:24 2005 ++++ gal/a11y/e-table/gal-a11y-e-cell-vbox.c Wed Feb 9 23:04:46 2005 +@@ -31,8 +31,9 @@ + static gint + ecv_get_n_children (AtkObject *a11y) + { ++ GalA11yECellVbox *gaev; + g_return_val_if_fail (GAL_A11Y_IS_E_CELL_VBOX (a11y), 0); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); + return (gaev->a11y_subcell_count); + } + +@@ -64,9 +65,10 @@ + if (i < gaev->a11y_subcell_count) { + if (gaev->a11y_subcells[i] == NULL) { + gint model_col, row; ++ ECellView *subcell_view; + row = gaec->row; + model_col = ecvv->model_cols[i]; +- ECellView *subcell_view = ecvv->subcell_views[i]; ++ subcell_view = ecvv->subcell_views[i]; + ret = gal_a11y_e_cell_registry_get_object (NULL, + gaec->item, + subcell_view, +@@ -200,14 +202,17 @@ + int row) + { + AtkObject *a11y; ++ GalA11yECell *gaec; ++ GalA11yECellVbox *gaev; ++ ECellVboxView *ecvv; + + a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL); + + gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row); + +- GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y); +- GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y); +- ECellVboxView *ecvv = (ECellVboxView *) (gaec->cell_view); ++ gaec = GAL_A11Y_E_CELL (a11y); ++ gaev = GAL_A11Y_E_CELL_VBOX (a11y); ++ ecvv = (ECellVboxView *) (gaec->cell_view); + gaev->a11y_subcell_count = ecvv->subcell_view_count; + gaev->a11y_subcells = g_malloc0 (sizeof(AtkObject *)*gaev->a11y_subcell_count); + return a11y; diff --git a/x11-toolkits/gal2/files/patch-po_da.po b/x11-toolkits/gal2/files/patch-po_da.po deleted file mode 100644 index bcd97ad6fff8..000000000000 --- a/x11-toolkits/gal2/files/patch-po_da.po +++ /dev/null @@ -1,16 +0,0 @@ ---- po/da.po.orig Sat Dec 27 21:03:49 2003 -+++ po/da.po Sat Dec 27 21:04:00 2003 -@@ -46,11 +46,11 @@ - - #: gal/e-table/e-cell-date.c:96 - msgid "%b %d %l:%M %p" --msgstr "%-d. %b. %H:%M" -+msgstr "%d. %b. %H:%M" - - #: gal/e-table/e-cell-date.c:98 - msgid "%b %d %Y" --msgstr "%-d. %b %Y" -+msgstr "%d. %b %Y" - - #: gal/e-table/e-cell-pixbuf.c:392 - msgid "Selected Column" diff --git a/x11-toolkits/gal2/files/patch-po_zh_CN.po b/x11-toolkits/gal2/files/patch-po_zh_CN.po deleted file mode 100644 index b3072e58b078..000000000000 --- a/x11-toolkits/gal2/files/patch-po_zh_CN.po +++ /dev/null @@ -1,17 +0,0 @@ ---- po/zh_CN.po.orig Fri Mar 5 12:17:59 2004 -+++ po/zh_CN.po Sat Mar 6 03:08:34 2004 -@@ -51,12 +51,12 @@ - # gal/e-table/e-cell-date.c:104 - #: gal/e-table/e-cell-date.c:96 - msgid "%b %d %l:%M %p" --msgstr "%-m月%-dæ—¥ %H:%M" -+msgstr "%m月%dæ—¥ %H:%M" - - # gal/e-table/e-cell-date.c:106 - #: gal/e-table/e-cell-date.c:98 - msgid "%b %d %Y" --msgstr "%Yå¹´%-m月%-dæ—¥" -+msgstr "%Yå¹´%m月%dæ—¥" - - #: gal/e-table/e-cell-pixbuf.c:392 - msgid "Selected Column" diff --git a/x11-toolkits/gal2/pkg-plist b/x11-toolkits/gal2/pkg-plist index ff1d616bfb3c..4715f0ed6751 100644 --- a/x11-toolkits/gal2/pkg-plist +++ b/x11-toolkits/gal2/pkg-plist @@ -3,6 +3,7 @@ include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-registry.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-text.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-toggle.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-tree.h +include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell-vbox.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-cell.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h include/gal-%%VERSION%%/gal/a11y/e-table/gal-a11y-e-table-click-to-add.h @@ -149,10 +150,10 @@ include/gal-%%VERSION%%/gal/widgets/widget-color-combo.h include/gal-%%VERSION%%/gal/widgets/widget-pixmap-combo.h lib/libgal-%%VERSION%%.a lib/libgal-%%VERSION%%.so -lib/libgal-%%VERSION%%.so.1 +lib/libgal-%%VERSION%%.so.0 lib/libgal-a11y-%%VERSION%%.a lib/libgal-a11y-%%VERSION%%.so -lib/libgal-a11y-%%VERSION%%.so.1 +lib/libgal-a11y-%%VERSION%%.so.0 libdata/pkgconfig/gal-%%VERSION%%.pc share/doc/gal-%%VERSION%%/gal-api.html share/doc/gal-%%VERSION%%/gal-api.sgml @@ -196,6 +197,7 @@ share/locale/bn/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/bs/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ca/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/cs/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/cy/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/da/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/de/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/el/LC_MESSAGES/gal-%%VERSION%%.mo @@ -209,10 +211,9 @@ share/locale/fr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ga/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/gl/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/gu/LC_MESSAGES/gal-%%VERSION%%.mo -share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/hi/LC_MESSAGES/gal-%%VERSION%%.mo +share/locale/hr/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/hu/LC_MESSAGES/gal-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/it/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ja/LC_MESSAGES/gal-%%VERSION%%.mo share/locale/ko/LC_MESSAGES/gal-%%VERSION%%.mo diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 83c017845e56..71a27f969595 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gtk -PORTVERSION= 2.4.14 -PORTREVISION= 2 +PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} @@ -39,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes -USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index e025356fddef..1e943cceaa24 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.14.tar.bz2) = 10470d574933460809e4ac488e579e26 -SIZE (gnome2/gtk+-2.4.14.tar.bz2) = 9641695 +MD5 (gnome2/gtk+-2.6.4.tar.bz2) = 4749fce7b082b784a71a076aa586dc25 +SIZE (gnome2/gtk+-2.6.4.tar.bz2) = 11222426 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad deleted file mode 100644 index 59fee01c4973..000000000000 --- a/x11-toolkits/gtk20/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- gtk/gtkrc.c.orig Thu Dec 13 21:51:18 2001 -+++ gtk/gtkrc.c Fri Jan 18 11:14:14 2002 -@@ -336,7 +336,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); - } - - return result; -@@ -418,7 +418,7 @@ - } - else - { -- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL); - - gtk_rc_add_default_file (str); - g_free (str); diff --git a/x11-toolkits/gtk20/files/patch-ag b/x11-toolkits/gtk20/files/patch-ag deleted file mode 100644 index b34d2b3f24b6..000000000000 --- a/x11-toolkits/gtk20/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 -+++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 -@@ -301,7 +301,7 @@ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -@@ -856,6 +856,7 @@ - TEST_DEPS = $(DEPS) gtk.immodules - - LDADDS = \ -+ $(GLIB_LIBS) \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in index c2cb10b5478c..1bedfdf55f2c 100644 --- a/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk20/files/patch-gdk-pixbuf_Makefile.in @@ -1,13 +1,15 @@ ---- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 -+++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 -@@ -517,7 +517,9 @@ +--- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 ++++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 +@@ -519,10 +519,10 @@ + bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders + gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -+LDADDS = \ -+ $(GLIB_LIBS) \ -+ libgdk_pixbuf-$(GTK_API_VERSION).la + gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) + + gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in new file mode 100644 index 000000000000..44589795f769 --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in @@ -0,0 +1,17 @@ +--- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 ++++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 +@@ -887,12 +887,12 @@ + bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache + + gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) ++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_query_immodules_2_0_SOURCES = queryimmodules.c + + gtk_update_icon_cache_DEPENDENCIES = $(DEPS) +-gtk_update_icon_cache_LDADD = $(LDADDS) ++gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_update_icon_cache_SOURCES = updateiconcache.c + subdir = gtk diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c new file mode 100644 index 000000000000..e725de399cff --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkentry.c @@ -0,0 +1,13 @@ +--- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 ++++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 +@@ -1670,8 +1670,9 @@ + event->x + entry->scroll_offset, event->y)) + { + GdkDragContext *context; ++ guint actions; + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); +- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; ++ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; + + gtk_target_list_add_text_targets (target_list); + diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c new file mode 100644 index 000000000000..d393bd3dfa8d --- /dev/null +++ b/x11-toolkits/gtk20/files/patch-gtk_gtkiconcache.c @@ -0,0 +1,20 @@ +--- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 ++++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 +@@ -21,6 +21,8 @@ + #include "gtkdebug.h" + #include "gtkiconcache.h" + #include <glib/gstdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #ifdef HAVE_MMAP + #include <sys/mman.h> +@@ -29,8 +31,6 @@ + #include <windows.h> + #include <io.h> + #endif +-#include <sys/types.h> +-#include <sys/stat.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif diff --git a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c deleted file mode 100644 index 07bb57a6d022..000000000000 --- a/x11-toolkits/gtk20/files/patch-gtk_gtkicontheme.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 -+++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 -@@ -526,7 +526,7 @@ - - priv->custom_theme = FALSE; - priv->current_theme = g_strdup (DEFAULT_THEME_NAME); -- priv->search_path = g_new (char *, 5); -+ priv->search_path = g_new (char *, 7); - - - priv->search_path[0] = g_build_filename (g_get_home_dir (), -@@ -534,9 +534,11 @@ - NULL); - priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); - priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); -- priv->search_path[3] = g_strdup ("/usr/share/icons"); -- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); -- priv->search_path_len = 5; -+ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); -+ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); -+ priv->search_path[5] = g_strdup ("/usr/share/icons"); -+ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); -+ priv->search_path_len = 7; - - priv->themes_valid = FALSE; - priv->themes = NULL; diff --git a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c index 76c5eea6c35b..b39aaedd07b5 100644 --- a/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk20/files/patch-gtk_xdgmime_xdgmime.c @@ -1,11 +1,11 @@ ---- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004 -+++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004 -@@ -98,7 +98,7 @@ +--- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 ++++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 +@@ -204,7 +204,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 7e4a1740997d..77127e3a5c4b 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -2,19 +2,23 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo bin/gtk-query-immodules-2.0 +bin/gtk-update-icon-cache 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-core.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-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h +include/gtk-2.0/gdk/gdkalias.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -45,7 +49,10 @@ include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gdkconfig.h +include/gtk-2.0/gtk/gtkcellview.h +include/gtk-2.0/gtk/gtkiconview.h include/gtk-2.0/gtk/gtk.h +include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h @@ -65,7 +72,9 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h @@ -92,6 +101,7 @@ include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserbutton.h include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h @@ -134,8 +144,10 @@ include/gtk-2.0/gtk/gtkmenu.h include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -214,6 +226,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%%/engines/libpixmap.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so @@ -240,16 +253,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.400 +lib/libgdk-x11-2.0.so.600 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.400 +lib/libgdk_pixbuf-2.0.so.600 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.400 +lib/libgdk_pixbuf_xlib-2.0.so.600 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.400 +lib/libgtk-x11-2.0.so.600 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -263,6 +276,7 @@ share/gtk-2.0/demo/appwindow.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/clipboard.c share/gtk-2.0/demo/colorsel.c share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/drawingarea.c @@ -273,12 +287,15 @@ share/gtk-2.0/demo/floppybuddy.gif share/gtk-2.0/demo/gnome-applets.png share/gtk-2.0/demo/gnome-calendar.png share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-fs-directory.png +share/gtk-2.0/demo/gnome-fs-regular.png share/gtk-2.0/demo/gnome-gimp.png share/gtk-2.0/demo/gnome-gmush.png share/gtk-2.0/demo/gnome-gsame.png share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -286,6 +303,7 @@ share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pixbufs.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -293,8 +311,6 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ang/LC_MESSAGES/gtk20-properties.mo -share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -407,6 +423,8 @@ share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/rw/LC_MESSAGES/gtk20-properties.mo +share/locale/rw/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20-properties.mo @@ -439,6 +457,8 @@ share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/xh/LC_MESSAGES/gtk20-properties.mo +share/locale/xh/LC_MESSAGES/gtk20.mo share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo @@ -470,8 +490,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR 2> /dev/null || true @unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true @@ -484,9 +502,13 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 83c017845e56..71a27f969595 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -6,15 +6,15 @@ # PORTNAME= gtk -PORTVERSION= 2.4.14 -PORTREVISION= 2 +PORTVERSION= 2.6.4 +PORTREVISION= 1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.4,} \ - ftp://ftp.gtk.org/pub/gtk/v2.4/ \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/2.6,} \ + ftp://ftp.gtk.org/pub/gtk/v2.6/ \ ftp://ftp.gimp.org/pub/%SUBDIR%/ \ ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \ http://www.ameth.org/gimp/%SUBDIR%/ \ - ftp://ftp.mirrorservice.org/sites/ftp.gimp.org/pub/%SUBDIR%/ \ + ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R} DISTNAME= gtk+-${PORTVERSION} @@ -39,7 +39,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_BZIP2= yes LATEST_LINK= gtk20 USE_X_PREFIX= yes -USE_GMAKE= yes USE_XPM= yes USE_REINPLACE= yes USE_PERL5= yes diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index e025356fddef..1e943cceaa24 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gtk+-2.4.14.tar.bz2) = 10470d574933460809e4ac488e579e26 -SIZE (gnome2/gtk+-2.4.14.tar.bz2) = 9641695 +MD5 (gnome2/gtk+-2.6.4.tar.bz2) = 4749fce7b082b784a71a076aa586dc25 +SIZE (gnome2/gtk+-2.6.4.tar.bz2) = 11222426 MD5 (gnome2/gtk+-2.4.0-menushadow.patch) = 5dde5c5af8f25d282c365663a7256b5c SIZE (gnome2/gtk+-2.4.0-menushadow.patch) = 15603 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad deleted file mode 100644 index 59fee01c4973..000000000000 --- a/x11-toolkits/gtk30/files/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- gtk/gtkrc.c.orig Thu Dec 13 21:51:18 2001 -+++ gtk/gtkrc.c Fri Jan 18 11:14:14 2002 -@@ -336,7 +336,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_DATA_PREFIX, "etc", "gtk-2.0", "gtk.immodules", NULL); - } - - return result; -@@ -418,7 +418,7 @@ - } - else - { -- str = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtkrc", NULL); -+ str = g_build_filename (GTK_SYSCONFDIR, "gtk", NULL); - - gtk_rc_add_default_file (str); - g_free (str); diff --git a/x11-toolkits/gtk30/files/patch-ag b/x11-toolkits/gtk30/files/patch-ag deleted file mode 100644 index b34d2b3f24b6..000000000000 --- a/x11-toolkits/gtk30/files/patch-ag +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk/Makefile.in.orig Fri Oct 24 21:45:12 2003 -+++ gtk/Makefile.in Fri Oct 24 21:46:49 2003 -@@ -301,7 +301,7 @@ - -DGTK_LIBDIR=\"$(libdir)\" \ - -DGTK_DATADIR=\"$(datadir)\" \ - -DGTK_DATA_PREFIX=\"$(prefix)\" \ -- -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ -+ -DGTK_SYSCONFDIR=\"$(datadir)/themes/Default/gtk-2.0\" \ - -DGTK_VERSION=\"$(GTK_VERSION)\" \ - -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ - -DGTK_HOST=\"$(host)\" \ -@@ -856,6 +856,7 @@ - TEST_DEPS = $(DEPS) gtk.immodules - - LDADDS = \ -+ $(GLIB_LIBS) \ - $(gtktargetlib) \ - $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \ - $(top_builddir)/gdk/$(gdktargetlib) diff --git a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in index c2cb10b5478c..1bedfdf55f2c 100644 --- a/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in +++ b/x11-toolkits/gtk30/files/patch-gdk-pixbuf_Makefile.in @@ -1,13 +1,15 @@ ---- gdk-pixbuf/Makefile.in.orig Thu Nov 20 15:39:55 2003 -+++ gdk-pixbuf/Makefile.in Thu Nov 20 15:40:17 2003 -@@ -517,7 +517,9 @@ +--- gdk-pixbuf/Makefile.in.orig Wed Mar 2 15:56:36 2005 ++++ gdk-pixbuf/Makefile.in Wed Mar 2 15:57:08 2005 +@@ -519,10 +519,10 @@ + bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders + gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c +-gdk_pixbuf_csource_LDADD = $(LDADDS) ++gdk_pixbuf_csource_LDADD = $(LDADDS) $(GLIB_LIBS) - AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"" --LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la -+LDADDS = \ -+ $(GLIB_LIBS) \ -+ libgdk_pixbuf-$(GTK_API_VERSION).la + gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS) +-gdk_pixbuf_query_loaders_LDADD = $(LDADDS) ++gdk_pixbuf_query_loaders_LDADD = $(LDADDS) $(GLIB_LIBS) + + gdk_pixbuf_query_loaders_SOURCES = queryloaders.c - noinst_PROGRAMS = test-gdk-pixbuf - test_gdk_pixbuf_LDADD = $(LDADDS) diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in new file mode 100644 index 000000000000..44589795f769 --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in @@ -0,0 +1,17 @@ +--- gtk/Makefile.in.orig Wed Mar 2 15:57:44 2005 ++++ gtk/Makefile.in Wed Mar 2 15:58:22 2005 +@@ -887,12 +887,12 @@ + bin_PROGRAMS = gtk-query-immodules-2.0 gtk-update-icon-cache + + gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) +-gtk_query_immodules_2_0_LDADD = $(LDADDS) ++gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_query_immodules_2_0_SOURCES = queryimmodules.c + + gtk_update_icon_cache_DEPENDENCIES = $(DEPS) +-gtk_update_icon_cache_LDADD = $(LDADDS) ++gtk_update_icon_cache_LDADD = $(LDADDS) $(GLIB_LIBS) + + gtk_update_icon_cache_SOURCES = updateiconcache.c + subdir = gtk diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c new file mode 100644 index 000000000000..e725de399cff --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkentry.c @@ -0,0 +1,13 @@ +--- gtk/gtkentry.c.orig Wed Aug 25 12:44:23 2004 ++++ gtk/gtkentry.c Wed Aug 25 12:44:52 2004 +@@ -1670,8 +1670,9 @@ + event->x + entry->scroll_offset, event->y)) + { + GdkDragContext *context; ++ guint actions; + GtkTargetList *target_list = gtk_target_list_new (NULL, 0); +- guint actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; ++ actions = entry->editable ? GDK_ACTION_COPY | GDK_ACTION_MOVE : GDK_ACTION_COPY; + + gtk_target_list_add_text_targets (target_list); + diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c new file mode 100644 index 000000000000..d393bd3dfa8d --- /dev/null +++ b/x11-toolkits/gtk30/files/patch-gtk_gtkiconcache.c @@ -0,0 +1,20 @@ +--- gtk/gtkiconcache.c.orig Sun Dec 12 16:09:13 2004 ++++ gtk/gtkiconcache.c Thu Dec 16 17:09:23 2004 +@@ -21,6 +21,8 @@ + #include "gtkdebug.h" + #include "gtkiconcache.h" + #include <glib/gstdio.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #ifdef HAVE_MMAP + #include <sys/mman.h> +@@ -29,8 +31,6 @@ + #include <windows.h> + #include <io.h> + #endif +-#include <sys/types.h> +-#include <sys/stat.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> + #endif diff --git a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c b/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c deleted file mode 100644 index 07bb57a6d022..000000000000 --- a/x11-toolkits/gtk30/files/patch-gtk_gtkicontheme.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gtk/gtkicontheme.c.orig Thu Jan 29 16:53:42 2004 -+++ gtk/gtkicontheme.c Thu Jan 29 16:54:56 2004 -@@ -526,7 +526,7 @@ - - priv->custom_theme = FALSE; - priv->current_theme = g_strdup (DEFAULT_THEME_NAME); -- priv->search_path = g_new (char *, 5); -+ priv->search_path = g_new (char *, 7); - - - priv->search_path[0] = g_build_filename (g_get_home_dir (), -@@ -534,9 +534,11 @@ - NULL); - priv->search_path[1] = g_build_filename (GTK_DATADIR, "pixmaps", NULL); - priv->search_path[2] = g_build_filename (GTK_DATADIR, "icons", NULL); -- priv->search_path[3] = g_strdup ("/usr/share/icons"); -- priv->search_path[4] = g_strdup ("/usr/share/pixmaps"); -- priv->search_path_len = 5; -+ priv->search_path[3] = g_build_filename (GTK_DATADIR, "gnome", "pixmaps", NULL); -+ priv->search_path[4] = g_build_filename (GTK_DATADIR, "gnome", "icons", NULL); -+ priv->search_path[5] = g_strdup ("/usr/share/icons"); -+ priv->search_path[6] = g_strdup ("/usr/share/pixmaps"); -+ priv->search_path_len = 7; - - priv->themes_valid = FALSE; - priv->themes = NULL; diff --git a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c index 76c5eea6c35b..b39aaedd07b5 100644 --- a/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c +++ b/x11-toolkits/gtk30/files/patch-gtk_xdgmime_xdgmime.c @@ -1,11 +1,11 @@ ---- gtk/xdgmime/xdgmime.c.orig Wed Jun 23 20:19:43 2004 -+++ gtk/xdgmime/xdgmime.c Wed Jun 23 20:19:56 2004 -@@ -98,7 +98,7 @@ +--- gtk/xdgmime/xdgmime.c.orig Mon Nov 8 22:25:27 2004 ++++ gtk/xdgmime/xdgmime.c Sat Nov 13 10:27:22 2004 +@@ -204,7 +204,7 @@ - xdg_data_dirs = getenv ("XDG_DATA_DIRS"); - if (xdg_data_dirs == NULL) -- xdg_data_dirs = "/usr/local/share/:/usr/share/"; -+ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; + xdg_data_dirs = getenv ("XDG_DATA_DIRS"); + if (xdg_data_dirs == NULL) +- xdg_data_dirs = "/usr/local/share/:/usr/share/"; ++ xdg_data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"; - ptr = xdg_data_dirs; + ptr = xdg_data_dirs; diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 7e4a1740997d..77127e3a5c4b 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -2,19 +2,23 @@ bin/gdk-pixbuf-csource bin/gdk-pixbuf-query-loaders bin/gtk-demo bin/gtk-query-immodules-2.0 +bin/gtk-update-icon-cache 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-core.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-transform.h include/gtk-2.0/gdk-pixbuf/gdk-pixbuf.h include/gtk-2.0/gdk-pixbuf/gdk-pixdata.h include/gtk-2.0/gdk/gdk.h +include/gtk-2.0/gdk/gdkalias.h include/gtk-2.0/gdk/gdkcolor.h include/gtk-2.0/gdk/gdkcursor.h include/gtk-2.0/gdk/gdkdisplay.h @@ -45,7 +49,10 @@ include/gtk-2.0/gdk/gdkvisual.h include/gtk-2.0/gdk/gdkwindow.h include/gtk-2.0/gdk/gdkx.h include/gtk-2.0/gdkconfig.h +include/gtk-2.0/gtk/gtkcellview.h +include/gtk-2.0/gtk/gtkiconview.h include/gtk-2.0/gtk/gtk.h +include/gtk-2.0/gtk/gtkaboutdialog.h include/gtk-2.0/gtk/gtkaccelgroup.h include/gtk-2.0/gtk/gtkaccellabel.h include/gtk-2.0/gtk/gtkaccelmap.h @@ -65,7 +72,9 @@ include/gtk-2.0/gtk/gtkcalendar.h include/gtk-2.0/gtk/gtkcelleditable.h include/gtk-2.0/gtk/gtkcelllayout.h include/gtk-2.0/gtk/gtkcellrenderer.h +include/gtk-2.0/gtk/gtkcellrenderercombo.h include/gtk-2.0/gtk/gtkcellrendererpixbuf.h +include/gtk-2.0/gtk/gtkcellrendererprogress.h include/gtk-2.0/gtk/gtkcellrenderertext.h include/gtk-2.0/gtk/gtkcellrenderertoggle.h include/gtk-2.0/gtk/gtkcheckbutton.h @@ -92,6 +101,7 @@ include/gtk-2.0/gtk/gtkenums.h include/gtk-2.0/gtk/gtkeventbox.h include/gtk-2.0/gtk/gtkexpander.h include/gtk-2.0/gtk/gtkfilechooser.h +include/gtk-2.0/gtk/gtkfilechooserbutton.h include/gtk-2.0/gtk/gtkfilechooserdialog.h include/gtk-2.0/gtk/gtkfilechooserwidget.h include/gtk-2.0/gtk/gtkfilefilter.h @@ -134,8 +144,10 @@ include/gtk-2.0/gtk/gtkmenu.h include/gtk-2.0/gtk/gtkmenubar.h include/gtk-2.0/gtk/gtkmenuitem.h include/gtk-2.0/gtk/gtkmenushell.h +include/gtk-2.0/gtk/gtkmenutoolbutton.h include/gtk-2.0/gtk/gtkmessagedialog.h include/gtk-2.0/gtk/gtkmisc.h +include/gtk-2.0/gtk/gtkmodules.h include/gtk-2.0/gtk/gtknotebook.h include/gtk-2.0/gtk/gtkobject.h include/gtk-2.0/gtk/gtkoldeditable.h @@ -214,6 +226,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%%/engines/libpixmap.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-am-et.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cedilla.so lib/gtk-2.0/%%GTK_VERSION%%/immodules/im-cyrillic-translit.so @@ -240,16 +253,16 @@ lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xbm.so lib/gtk-2.0/%%GTK_VERSION%%/loaders/libpixbufloader-xpm.so lib/libgdk-x11-2.0.a lib/libgdk-x11-2.0.so -lib/libgdk-x11-2.0.so.400 +lib/libgdk-x11-2.0.so.600 lib/libgdk_pixbuf-2.0.a lib/libgdk_pixbuf-2.0.so -lib/libgdk_pixbuf-2.0.so.400 +lib/libgdk_pixbuf-2.0.so.600 lib/libgdk_pixbuf_xlib-2.0.a lib/libgdk_pixbuf_xlib-2.0.so -lib/libgdk_pixbuf_xlib-2.0.so.400 +lib/libgdk_pixbuf_xlib-2.0.so.600 lib/libgtk-x11-2.0.a lib/libgtk-x11-2.0.so -lib/libgtk-x11-2.0.so.400 +lib/libgtk-x11-2.0.so.600 libdata/pkgconfig/gdk-2.0.pc libdata/pkgconfig/gdk-pixbuf-2.0.pc libdata/pkgconfig/gdk-pixbuf-xlib-2.0.pc @@ -263,6 +276,7 @@ share/gtk-2.0/demo/appwindow.c share/gtk-2.0/demo/background.jpg share/gtk-2.0/demo/button_box.c share/gtk-2.0/demo/changedisplay.c +share/gtk-2.0/demo/clipboard.c share/gtk-2.0/demo/colorsel.c share/gtk-2.0/demo/dialog.c share/gtk-2.0/demo/drawingarea.c @@ -273,12 +287,15 @@ share/gtk-2.0/demo/floppybuddy.gif share/gtk-2.0/demo/gnome-applets.png share/gtk-2.0/demo/gnome-calendar.png share/gtk-2.0/demo/gnome-foot.png +share/gtk-2.0/demo/gnome-fs-directory.png +share/gtk-2.0/demo/gnome-fs-regular.png share/gtk-2.0/demo/gnome-gimp.png share/gtk-2.0/demo/gnome-gmush.png share/gtk-2.0/demo/gnome-gsame.png share/gtk-2.0/demo/gnu-keys.png share/gtk-2.0/demo/gtk-logo-rgb.gif share/gtk-2.0/demo/hypertext.c +share/gtk-2.0/demo/iconview.c share/gtk-2.0/demo/images.c share/gtk-2.0/demo/list_store.c share/gtk-2.0/demo/menus.c @@ -286,6 +303,7 @@ share/gtk-2.0/demo/panes.c share/gtk-2.0/demo/pixbufs.c share/gtk-2.0/demo/sizegroup.c share/gtk-2.0/demo/stock_browser.c +share/gtk-2.0/demo/rotated_text.c share/gtk-2.0/demo/textview.c share/gtk-2.0/demo/tree_store.c share/gtk-2.0/demo/ui_manager.c @@ -293,8 +311,6 @@ share/locale/af/LC_MESSAGES/gtk20-properties.mo share/locale/af/LC_MESSAGES/gtk20.mo share/locale/am/LC_MESSAGES/gtk20-properties.mo share/locale/am/LC_MESSAGES/gtk20.mo -share/locale/ang/LC_MESSAGES/gtk20-properties.mo -share/locale/ang/LC_MESSAGES/gtk20.mo share/locale/ar/LC_MESSAGES/gtk20-properties.mo share/locale/ar/LC_MESSAGES/gtk20.mo share/locale/az/LC_MESSAGES/gtk20-properties.mo @@ -407,6 +423,8 @@ share/locale/ro/LC_MESSAGES/gtk20-properties.mo share/locale/ro/LC_MESSAGES/gtk20.mo share/locale/ru/LC_MESSAGES/gtk20-properties.mo share/locale/ru/LC_MESSAGES/gtk20.mo +share/locale/rw/LC_MESSAGES/gtk20-properties.mo +share/locale/rw/LC_MESSAGES/gtk20.mo share/locale/sk/LC_MESSAGES/gtk20-properties.mo share/locale/sk/LC_MESSAGES/gtk20.mo share/locale/sl/LC_MESSAGES/gtk20-properties.mo @@ -439,6 +457,8 @@ share/locale/vi/LC_MESSAGES/gtk20-properties.mo share/locale/vi/LC_MESSAGES/gtk20.mo share/locale/wa/LC_MESSAGES/gtk20-properties.mo share/locale/wa/LC_MESSAGES/gtk20.mo +share/locale/xh/LC_MESSAGES/gtk20-properties.mo +share/locale/xh/LC_MESSAGES/gtk20.mo share/locale/yi/LC_MESSAGES/gtk20-properties.mo share/locale/yi/LC_MESSAGES/gtk20.mo share/locale/zh_CN/LC_MESSAGES/gtk20-properties.mo @@ -470,8 +490,6 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @exec /bin/mkdir -p %D/lib/gtk-2.0/%%GTK_VERSION%%/engines @unexec /bin/rmdir %D/share/themes/Default 2>/dev/null || /usr/bin/true @unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true -@unexec rmdir %D/share/locale/ang/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/ang 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/az_IR 2> /dev/null || true @unexec rmdir %D/share/locale/br/LC_MESSAGES 2> /dev/null || true @@ -484,9 +502,13 @@ share/themes/Emacs/gtk-2.0-key/gtkrc @unexec rmdir %D/share/locale/mr 2> /dev/null || true @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/nso 2> /dev/null || true +@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/rw 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/uz@Latn 2> /dev/null || true @unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yi 2> /dev/null || true +@unexec rmdir %D/share/locale/xh/LC_MESSAGES/ 2> /dev/null || true +@unexec rmdir %D/share/locale/xh 2> /dev/null || true diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index 516a256d6939..94c8e882548c 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeprintui -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0.1 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo index f0c00d24ad35..7842db915057 100644 --- a/x11-toolkits/libgnomeprintui/distinfo +++ b/x11-toolkits/libgnomeprintui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeprintui-2.8.2.tar.bz2) = b38d1f6813dd52879ba4174ddc3f1b1c -SIZE (gnome2/libgnomeprintui-2.8.2.tar.bz2) = 583090 +MD5 (gnome2/libgnomeprintui-2.10.0.1.tar.bz2) = 36e2775878fb518d30dcf5c3d6438d89 +SIZE (gnome2/libgnomeprintui-2.10.0.1.tar.bz2) = 625431 diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist index 546d1a8626e1..bd41a2e5cbd3 100644 --- a/x11-toolkits/libgnomeprintui/pkg-plist +++ b/x11-toolkits/libgnomeprintui/pkg-plist @@ -5,6 +5,7 @@ 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 +include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h lib/libgnomeprintui-2-2.a lib/libgnomeprintui-2-2.so lib/libgnomeprintui-2-2.so.1 @@ -64,6 +65,7 @@ share/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/li/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/mk/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo @@ -87,8 +89,8 @@ share/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo share/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo -share/locale/vi/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 diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 549943b07f98..12540b3a053c 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnomeui -PORTVERSION= 2.8.1 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libgnomeui/distinfo b/x11-toolkits/libgnomeui/distinfo index fa9a97112ccf..f12a6a3dc0f1 100644 --- a/x11-toolkits/libgnomeui/distinfo +++ b/x11-toolkits/libgnomeui/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnomeui-2.8.1.tar.bz2) = d46a2b34bdfbc1b36464176fa8bef03c -SIZE (gnome2/libgnomeui-2.8.1.tar.bz2) = 1456239 +MD5 (gnome2/libgnomeui-2.10.0.tar.bz2) = e17c0d97e5f240513ac2d36268d696ed +SIZE (gnome2/libgnomeui-2.10.0.tar.bz2) = 1652481 diff --git a/x11-toolkits/libgnomeui/files/patch-Makefile.in b/x11-toolkits/libgnomeui/files/patch-Makefile.in deleted file mode 100644 index 045ff7f723b0..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Mar 22 00:31:40 2004 -+++ Makefile.in Mon Mar 22 00:32:06 2004 -@@ -139,7 +139,7 @@ - YACC = @YACC@ - gnomelocaledir = @gnomelocaledir@ - --SUBDIRS = libgnomeui file-chooser glade images demos test-gnome doc po #tests -+SUBDIRS = libgnomeui file-chooser glade images demos doc po #tests - - EXTRA_DIST = COPYING.LIB NEWS - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in deleted file mode 100644 index 938ac8dbe444..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- libgnomeui/Makefile.in.orig Wed Feb 25 01:08:42 2004 -+++ libgnomeui/Makefile.in Wed Feb 25 01:10:01 2004 -@@ -158,7 +158,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/files/patch-libgnomeui_gnome-ice.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c deleted file mode 100644 index 8c5bbd501398..000000000000 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-ice.c +++ /dev/null @@ -1,20 +0,0 @@ ---- libgnomeui/gnome-ice.c.orig Fri Oct 22 23:22:11 2004 -+++ libgnomeui/gnome-ice.c Fri Oct 22 23:22:38 2004 -@@ -54,6 +54,8 @@ - IceConn connection = (IceConn) data; - IceProcessMessagesStatus status; - -+ GDK_THREADS_ENTER(); -+ - status = IceProcessMessages (connection, NULL, NULL); - - if (status == IceProcessMessagesIOError) -@@ -73,6 +75,8 @@ - IceCloseConnection (connection); - } - } -+ -+ GDK_THREADS_LEAVE(); - - return TRUE; - } diff --git a/x11-toolkits/libgnomeui/pkg-plist b/x11-toolkits/libgnomeui/pkg-plist index d8556ce5b894..c11e1154680c 100644 --- a/x11-toolkits/libgnomeui/pkg-plist +++ b/x11-toolkits/libgnomeui/pkg-plist @@ -53,9 +53,97 @@ lib/gtk-2.0/%%GTK_VERSION%%/filesystems/libgnome-vfs.so lib/libglade/2.0/libgnome.so lib/libgnomeui-2.a lib/libgnomeui-2.so -lib/libgnomeui-2.so.800 +lib/libgnomeui-2.so.1000 libdata/pkgconfig/libgnomeui-2.0.pc libexec/gnome_segv2 +%%DOCSDIR%%/GnomeAbout.html +%%DOCSDIR%%/GnomeApp.html +%%DOCSDIR%%/GnomeAppBar.html +%%DOCSDIR%%/GnomeClient.html +%%DOCSDIR%%/GnomeColorPicker.html +%%DOCSDIR%%/GnomeDateEdit.html +%%DOCSDIR%%/GnomeDialog.html +%%DOCSDIR%%/GnomeDruid.html +%%DOCSDIR%%/GnomeDruidPage.html +%%DOCSDIR%%/GnomeDruidPageEdge.html +%%DOCSDIR%%/GnomeDruidPageStandard.html +%%DOCSDIR%%/GnomeEntry.html +%%DOCSDIR%%/GnomeFileEntry.html +%%DOCSDIR%%/GnomeFontPicker.html +%%DOCSDIR%%/GnomeHRef.html +%%DOCSDIR%%/GnomeIconEntry.html +%%DOCSDIR%%/GnomeIconList.html +%%DOCSDIR%%/GnomeIconSelection.html +%%DOCSDIR%%/GnomeMDI.html +%%DOCSDIR%%/GnomeMDIChild.html +%%DOCSDIR%%/GnomeMDIGenericChild.html +%%DOCSDIR%%/GnomeMessageBox.html +%%DOCSDIR%%/GnomePixmap.html +%%DOCSDIR%%/GnomePixmapEntry.html +%%DOCSDIR%%/GnomePropertyBox.html +%%DOCSDIR%%/GnomeScores.html +%%DOCSDIR%%/application-mgmt.html +%%DOCSDIR%%/ch01.html +%%DOCSDIR%%/deprecated.html +%%DOCSDIR%%/druids.html +%%DOCSDIR%%/fixme.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnomeui-GnomeIconLookup.html +%%DOCSDIR%%/libgnomeui-GnomeIconTheme.html +%%DOCSDIR%%/libgnomeui-GnomeThemeFile.html +%%DOCSDIR%%/libgnomeui-GnomeThumbnail.html +%%DOCSDIR%%/libgnomeui-gnome-app-helper.html +%%DOCSDIR%%/libgnomeui-gnome-app-util.html +%%DOCSDIR%%/libgnomeui-gnome-dialog-util.html +%%DOCSDIR%%/libgnomeui-gnome-mdi-session.html +%%DOCSDIR%%/libgnomeui-gnome-popup-menu.html +%%DOCSDIR%%/libgnomeui-gnome-stock-icons.html +%%DOCSDIR%%/libgnomeui-gnome-types.html +%%DOCSDIR%%/libgnomeui-gnome-ui-init.html +%%DOCSDIR%%/libgnomeui-gnome-uidefs.html +%%DOCSDIR%%/libgnomeui-gnome-vfs-util.html +%%DOCSDIR%%/libgnomeui-gnome-window.html +%%DOCSDIR%%/libgnomeui-gnometypebuiltins.html +%%DOCSDIR%%/libgnomeui-objects.html +%%DOCSDIR%%/libgnomeui.devhelp +%%DOCSDIR%%/miscellaneous.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/stock_attach.png +%%DOCSDIR%%/stock_book_blue.png +%%DOCSDIR%%/stock_book_green.png +%%DOCSDIR%%/stock_book_open.png +%%DOCSDIR%%/stock_book_red.png +%%DOCSDIR%%/stock_book_yellow.png +%%DOCSDIR%%/stock_line_in.png +%%DOCSDIR%%/stock_mail.png +%%DOCSDIR%%/stock_mail_compose.png +%%DOCSDIR%%/stock_mail_forward.png +%%DOCSDIR%%/stock_mail_receive.png +%%DOCSDIR%%/stock_mail_reply.png +%%DOCSDIR%%/stock_mail_send.png +%%DOCSDIR%%/stock_menu_about.png +%%DOCSDIR%%/stock_menu_blank.png +%%DOCSDIR%%/stock_mic.png +%%DOCSDIR%%/stock_midi.png +%%DOCSDIR%%/stock_multiple_file.png +%%DOCSDIR%%/stock_not.png +%%DOCSDIR%%/stock_scores.png +%%DOCSDIR%%/stock_table_borders.png +%%DOCSDIR%%/stock_table_fill.png +%%DOCSDIR%%/stock_text_bulleted_list.png +%%DOCSDIR%%/stock_text_indent.png +%%DOCSDIR%%/stock_text_numbered_list.png +%%DOCSDIR%%/stock_text_unindent.png +%%DOCSDIR%%/stock_timer.png +%%DOCSDIR%%/stock_timer_stopped.png +%%DOCSDIR%%/stock_trash.png +%%DOCSDIR%%/stock_trash_full.png +%%DOCSDIR%%/stock_volume.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/gnome/pixmaps/gnome-about-logo.png share/gnome/pixmaps/gnome-default-dlg.png share/gnome/pixmaps/gnome-error.png @@ -120,6 +208,7 @@ share/locale/pt/LC_MESSAGES/libgnomeui-2.0.mo share/locale/pt_BR/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ro/LC_MESSAGES/libgnomeui-2.0.mo share/locale/ru/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/rw/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo share/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo @@ -134,14 +223,12 @@ share/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo share/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo share/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/wa/LC_MESSAGES/libgnomeui-2.0.mo +share/locale/xh/LC_MESSAGES/libgnomeui-2.0.mo share/locale/yi/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnomeui-2.0.mo share/locale/zu/LC_MESSAGES/libgnomeui-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true +@dirrm %%DOCSDIR%% @dirrm include/libgnomeui-2.0/libgnomeui @dirrm include/libgnomeui-2.0 @dirrm lib/gtk-2.0/%%GTK_VERSION%%/filesystems diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 385cfea32ece..b23c23cf021e 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -6,11 +6,10 @@ # PORTNAME= libwnck -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11-toolkits gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org diff --git a/x11-toolkits/libwnck/distinfo b/x11-toolkits/libwnck/distinfo index c9c164c626a5..d14209cc8843 100644 --- a/x11-toolkits/libwnck/distinfo +++ b/x11-toolkits/libwnck/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libwnck-2.8.1.tar.bz2) = c0a5a8478064287e167c15e3ec0e82a1 -SIZE (gnome2/libwnck-2.8.1.tar.bz2) = 396274 +MD5 (gnome2/libwnck-2.10.0.tar.bz2) = c04c79f1e8576bc930c79d2e7bb8190a +SIZE (gnome2/libwnck-2.10.0.tar.bz2) = 419060 diff --git a/x11-toolkits/libwnck/pkg-plist b/x11-toolkits/libwnck/pkg-plist index 2a3d77846f2a..2411986d8acf 100644 --- a/x11-toolkits/libwnck/pkg-plist +++ b/x11-toolkits/libwnck/pkg-plist @@ -3,16 +3,16 @@ include/libwnck-1.0/libwnck/class-group.h include/libwnck-1.0/libwnck/libwnck.h include/libwnck-1.0/libwnck/pager.h include/libwnck-1.0/libwnck/screen.h +include/libwnck-1.0/libwnck/selector.h include/libwnck-1.0/libwnck/tasklist.h include/libwnck-1.0/libwnck/util.h include/libwnck-1.0/libwnck/window-action-menu.h -include/libwnck-1.0/libwnck/window-menu.h include/libwnck-1.0/libwnck/window.h 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.13 +lib/libwnck-1.so.16 libdata/pkgconfig/libwnck-1.0.pc %%DOCSDIR%%/ch01.html %%DOCSDIR%%/home.png @@ -87,6 +87,7 @@ share/locale/mn/LC_MESSAGES/libwnck.mo share/locale/mr/LC_MESSAGES/libwnck.mo share/locale/ms/LC_MESSAGES/libwnck.mo share/locale/nb/LC_MESSAGES/libwnck.mo +share/locale/ne/LC_MESSAGES/libwnck.mo share/locale/nl/LC_MESSAGES/libwnck.mo share/locale/nn/LC_MESSAGES/libwnck.mo share/locale/no/LC_MESSAGES/libwnck.mo diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 000ba3dde7f1..382dba7757b9 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -6,9 +6,9 @@ # PORTNAME= pango -PORTVERSION= 1.6.0 +PORTVERSION= 1.8.1 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.6,} \ +MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.8,} \ ftp://ftp.gtk.org/pub/gtk/v2.6/ DIST_SUBDIR= gnome2 diff --git a/x11-toolkits/pango/distinfo b/x11-toolkits/pango/distinfo index 8f3ef561d1b3..47ca2a28be2c 100644 --- a/x11-toolkits/pango/distinfo +++ b/x11-toolkits/pango/distinfo @@ -1,4 +1,2 @@ -MD5 (gnome2/pango-1.6.0.tar.bz2) = 6c732bbc5fba5a0f1f8086e8aa4f490d -SIZE (gnome2/pango-1.6.0.tar.bz2) = 951911 -MD5 (gnome2/cjk-patch-pango-20041115.diff.gz) = 76e545d0bda595aced674ecf397eab63 -SIZE (gnome2/cjk-patch-pango-20041115.diff.gz) = 1930 +MD5 (gnome2/pango-1.8.1.tar.bz2) = 88aa6bf1876766db6864f3b93577887c +SIZE (gnome2/pango-1.8.1.tar.bz2) = 996389 diff --git a/x11-toolkits/pango/pkg-plist b/x11-toolkits/pango/pkg-plist index 5ce33aa86604..14d2d704b680 100644 --- a/x11-toolkits/pango/pkg-plist +++ b/x11-toolkits/pango/pkg-plist @@ -16,6 +16,7 @@ include/pango-1.0/pango/pango-item.h include/pango-1.0/pango/pango-layout.h include/pango-1.0/pango/pango-modules.h include/pango-1.0/pango/pango-ot.h +include/pango-1.0/pango/pango-renderer.h include/pango-1.0/pango/pango-script.h include/pango-1.0/pango/pango-tabs.h include/pango-1.0/pango/pango-types.h @@ -26,26 +27,29 @@ include/pango-1.0/pango/pangofc-font.h include/pango-1.0/pango/pangofc-fontmap.h include/pango-1.0/pango/pangoft2.h include/pango-1.0/pango/pangox.h +include/pango-1.0/pango/pangoxft-render.h include/pango-1.0/pango/pangoxft.h lib/libpango-1.0.a lib/libpango-1.0.so -lib/libpango-1.0.so.600 +lib/libpango-1.0.so.800 lib/libpangoft2-1.0.a lib/libpangoft2-1.0.so -lib/libpangoft2-1.0.so.600 +lib/libpangoft2-1.0.so.800 lib/libpangox-1.0.a lib/libpangox-1.0.so -lib/libpangox-1.0.so.600 +lib/libpangox-1.0.so.800 lib/libpangoxft-1.0.a lib/libpangoxft-1.0.so -lib/libpangoxft-1.0.so.600 +lib/libpangoxft-1.0.so.800 lib/pango/%%VERSION%%/modules/pango-arabic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-fc.so lib/pango/%%VERSION%%/modules/pango-basic-x.so lib/pango/%%VERSION%%/modules/pango-hangul-fc.so lib/pango/%%VERSION%%/modules/pango-hebrew-fc.so lib/pango/%%VERSION%%/modules/pango-indic-fc.so +lib/pango/%%VERSION%%/modules/pango-syriac-fc.so lib/pango/%%VERSION%%/modules/pango-thai-fc.so +lib/pango/%%VERSION%%/modules/pango-tibetan-fc.so libdata/pkgconfig/pango.pc libdata/pkgconfig/pangoft2.pc libdata/pkgconfig/pangox.pc diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 07f2f493513a..9bc8a06a3ef1 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -6,7 +6,7 @@ # PORTNAME= metacity -PORTVERSION= 2.8.13 +PORTVERSION= 2.10.0 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R} @@ -22,12 +22,15 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL_VER=15 -USE_GNOME= gnomeprefix intlhack gnomehack gnomehier gconf2 libglade2 +USE_GNOME= gnomeprefix intlhack gnomehack gconf2 INSTALLS_SHLIB= yes +CONFIGURE_ARGS= --enable-render CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" GCONF_SCHEMAS= metacity.schemas +MAN1= metacity-theme-viewer.1 metacity-window-demo.1 + .include <bsd.port.mk> diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo index a5e609db2090..2cc0abb186ba 100644 --- a/x11-wm/metacity/distinfo +++ b/x11-wm/metacity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/metacity-2.8.13.tar.bz2) = 81ac009f514c939831d72df52d77f0ed -SIZE (gnome2/metacity-2.8.13.tar.bz2) = 2178494 +MD5 (gnome2/metacity-2.10.0.tar.bz2) = fed363d8ce6ae33d6dd4850c8e48fbbc +SIZE (gnome2/metacity-2.10.0.tar.bz2) = 1581003 diff --git a/x11-wm/metacity/files/patch-configure b/x11-wm/metacity/files/patch-configure new file mode 100644 index 000000000000..09c5caee784b --- /dev/null +++ b/x11-wm/metacity/files/patch-configure @@ -0,0 +1,10 @@ +--- configure.orig Mon Jan 10 04:40:58 2005 ++++ configure Mon Jan 10 04:41:11 2005 +@@ -25377,7 +25377,6 @@ + + if test x$have_xrender = xyes; then + echo "Building with Render" +- METACITY_PC_MODULES="$METACITY_PC_MODULES xrender >= $XRENDER_VERSION" + fi + fi ## have_composite + diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist index 8fa23364fcd5..a4a73a6519f9 100644 --- a/x11-wm/metacity/pkg-plist +++ b/x11-wm/metacity/pkg-plist @@ -13,9 +13,7 @@ lib/libmetacity-private.so lib/libmetacity-private.so.0 libdata/pkgconfig/libmetacity-private.pc libexec/metacity-dialog -share/gnome/metacity/glade/metacity-properties.glade share/gnome/metacity/icons/metacity-window-demo.png -share/gnome/pixmaps/metacity-properties.png share/gnome/themes/AgingGorilla/metacity-1/active-button.png share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png @@ -174,8 +172,6 @@ share/locale/zh_TW/LC_MESSAGES/metacity.mo @dirrm share/gnome/themes/Simple @dirrm share/gnome/themes/Metabox/metacity-1 @dirrm share/gnome/themes/Metabox -@dirrm share/gnome/themes/AgingGorilla/metacity-1 -@dirrm share/gnome/themes/AgingGorilla @dirrm share/gnome/themes/Esco/metacity-1 @dirrm share/gnome/themes/Esco @dirrm share/gnome/themes/Crux/metacity-1 @@ -184,8 +180,9 @@ 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/AgingGorilla/metacity-1 +@dirrm share/gnome/themes/AgingGorilla @dirrm share/gnome/metacity/icons -@dirrm share/gnome/metacity/glade @dirrm share/gnome/metacity @dirrm include/metacity-1/metacity-private @dirrm include/metacity-1 diff --git a/x11/Makefile b/x11/Makefile index e23e3f15c3b2..3b1004b8f87d 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -59,6 +59,7 @@ SUBDIR += gmessage SUBDIR += gmrun SUBDIR += gnome-clipboard-daemon + SUBDIR += gnome-menus SUBDIR += gnome-swallow SUBDIR += gnome2 SUBDIR += gnome2-fifth-toe diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index ddc1e9ce7ad9..d2ee9028fc0f 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -6,27 +6,28 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.8 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ - xklavier.8:${PORTSDIR}/x11/libxklavier + xklavier.10:${PORTSDIR}/x11/libxklavier \ + gucharmap.4:${PORTSDIR}/deskutils/gucharmap +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes -USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ +INSTALLS_OMF= yes +USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ gail USE_GSTREAMER= yes USE_LIBTOOL_VER=15 @@ -34,10 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} -GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ +GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ - mailcheck.schemas mini-commander.schemas mixer.schemas \ - modemlights.schemas multiload.schemas stickynotes.schemas + mini-commander-global.schemas mini-commander.schemas \ + mixer.schemas multiload.schemas \ + stickynotes.schemas FREEBSD_SYS?= /usr/src/sys @@ -50,6 +52,7 @@ PLIST_SUB= BATTERY="@comment " GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" +.if ${OSVERSION} < 600019 pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " W A R N I N G" @@ -62,5 +65,13 @@ pre-everything:: @${ECHO_MSG} "*****************************************************" @${ECHO_MSG} "" .endif +.endif + +.if ${ARCH} != "i386" && ${ARCH} != "amd64" +PLIST_SUB+= CPUFREQ="@comment " +.else +PLIST_SUB+= CPUFREQ="" +GCONF_SCHEMAS+= cpufreq-applet.schemas +.endif .include <bsd.port.post.mk> diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 5812235d13fa..7bfa1c4099db 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.8.2.tar.bz2) = 10d83b6e031bad31d7cfefe2c4884bd7 -SIZE (gnome2/gnome-applets-2.8.2.tar.bz2) = 6049108 +MD5 (gnome2/gnome-applets-2.10.0.tar.bz2) = c230df43a21a0d788197b5b0f3e688f1 +SIZE (gnome2/gnome-applets-2.10.0.tar.bz2) = 5662438 diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index a0025a0ad050..2a74a1ed8f2b 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,23 +1,25 @@ ---- configure.orig Mon Dec 6 21:22:34 2004 -+++ configure Mon Dec 6 21:22:58 2004 +--- configure.orig Tue Mar 1 12:35:29 2005 ++++ configure Tue Mar 1 12:36:09 2005 @@ -463,7 +463,7 @@ # include <unistd.h> #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. -@@ -24351,6 +24351,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";; -+*freebsd*) CDROM_HOST=freebsd;cd_device_path="/dev/acd0c";; - *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; - esac - case "$host" in -@@ -24412,6 +24413,7 @@ +@@ -23136,8 +23136,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${prefix}/share/locale"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${prefix}/share/locale"` + GNOMELOCALEDIR="$ac_define_dir" + + +@@ -24838,6 +24837,7 @@ HAVE_LIBAPM=no NEED_LIBAPM=no @@ -25,7 +27,7 @@ build_battstat_applet=no if test x$disable_battstat = xno; then -@@ -24563,7 +24565,12 @@ +@@ -24989,7 +24989,12 @@ ;; # list of supported OS cores that do not use libapm @@ -39,28 +41,100 @@ ;; *) echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -26794,14 +26801,14 @@ - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +@@ -25795,6 +25800,9 @@ + *linux*) + build_cpufreq_applet=yes + ;; ++ i386-*-freebsd*|amd64-*-freebsd*) ++ build_cpufreq_applet=yes ++ ;; + *) + echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 + build_cpufreq_applet=no +@@ -26085,7 +26093,7 @@ + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - cat >>confdefs.h <<_ACEOF --#define GNOME_ICONDIR "${prefix}/share/pixmaps" -+#define GNOME_ICONDIR "${datadir}/pixmaps" - _ACEOF +-iconsdir="${datadir}/icons" ++iconsdir="${prefix}/share/icons" - #defined the below to enable help to work for applets + pixmapsdir="${datadir}/pixmaps" - cat >>confdefs.h <<_ACEOF --#define DATADIR "${prefix}/share" -+#define DATADIR "${datadir}" - _ACEOF +@@ -26099,8 +26107,7 @@ - cat >>confdefs.h <<_ACEOF -@@ -27954,6 +27961,7 @@ - s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t - s,@CDROM_HOST@,$CDROM_HOST,;t t - s,@CDROM_LIBS@,$CDROM_LIBS,;t t -+s,@ACPIINC@,$ACPIINC,;t t + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${iconsdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${iconsdir}"` + GNOME_ICONDIR="$ac_define_dir" + + +@@ -26112,8 +26119,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${pixmapsdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${pixmapsdir}"` + GNOME_PIXMAPSDIR="$ac_define_dir" + + +@@ -26125,8 +26131,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${gladedir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${gladedir}"` + GNOME_GLADEDIR="$ac_define_dir" + + +@@ -26138,8 +26143,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${datadir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${datadir}"` + DATADIR="$ac_define_dir" + + +@@ -26151,8 +26155,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${sysconfdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${sysconfdir}"` + SYSCONFDIR="$ac_define_dir" + + +@@ -26164,8 +26167,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${libdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${libdir}"` + LIBDIR="$ac_define_dir" + + +@@ -26177,8 +26179,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"$prefix"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "$prefix"` + PREFIX="$ac_define_dir" + + +@@ -27311,6 +27312,7 @@ + s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t ++s,@ACPIINC@,$ACPIINC,;t t s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t + s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t + s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t diff --git a/x11/gnome-applets/files/patch-ad b/x11/gnome-applets/files/patch-ad deleted file mode 100644 index 5a06416a08c4..000000000000 --- a/x11/gnome-applets/files/patch-ad +++ /dev/null @@ -1,354 +0,0 @@ ---- cdplayer/cdplayer.c.orig Tue Apr 16 16:42:54 2002 -+++ cdplayer/cdplayer.c Tue Apr 30 17:31:41 2002 -@@ -671,6 +671,12 @@ - description = TRUE; - break; - case DISC_COMPLETED: -+ led_time(cd->panel.time, -+ stat.relative_address.minute, -+ stat.relative_address.second, -+ cd->panel.track_control.display, -+ stat.track); -+ break; - case DISC_STOP: - case DISC_ERROR: - led_stop(cd->panel.time, cd->panel.track_control.display); ---- /dev/null Mon May 29 02:15:42 2000 -+++ cdplayer/cdrom-freebsd.c Mon May 29 10:37:28 2000 -@@ -0,0 +1,336 @@ -+#include <stdlib.h> -+#include <string.h> -+#include <fcntl.h> -+#include <glib.h> -+#include <sys/ioctl.h> -+#include <unistd.h> -+ -+#include <sys/types.h> -+#include <sys/cdio.h> -+#include "cdrom-interface.h" -+ -+ -+#define ASSIGN_MSF(dest, src) \ -+{ \ -+ (dest).minute = (src).minute; \ -+ (dest).second = (src).second; \ -+ (dest).frame = (src).frame; \ -+} -+ -+int -+cdrom_play(cdrom_device_t cdp, int start, int stop) -+{ -+ struct ioc_play_track ti; -+ -+ ti.start_track = start; -+ ti.start_index = 1; -+ ti.end_track = stop; -+ ti.end_index = 1; -+ -+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) || -+ (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start) -+{ -+ struct ioc_play_msf msf; -+ -+ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR) -+ return DISC_IO_ERROR; -+ msf.start_m = start->minute; -+ msf.start_s = start->second; -+ msf.start_f = start->frame; -+ -+ msf.end_m = cdp->track_info[cdp->nr_track].address.minute; -+ msf.end_s = cdp->track_info[cdp->nr_track].address.second; -+ msf.end_f = cdp->track_info[cdp->nr_track].address.frame; -+ -+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) || -+ (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_pause(cdrom_device_t cdp) -+{ -+ if (ioctl(cdp->device, CDIOCPAUSE) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_IO_ERROR; -+} -+ -+int -+cdrom_resume(cdrom_device_t cdp) -+{ -+ if (ioctl(cdp->device, CDIOCRESUME) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+ -+int -+cdrom_stop(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCSTOP) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_read_track_info(cdrom_device_t cdp) -+{ -+ struct ioc_toc_header toc; -+ struct ioc_read_toc_single_entry tocentry; -+ -+ int i, j, nr_track; -+ -+ if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ cdp->track0 = toc.starting_track; -+ cdp->track1 = toc.ending_track; -+ nr_track = cdp->track1 - cdp->track0 + 1; -+ if (nr_track <= 0) -+ return DISC_IO_ERROR; -+ -+ if (nr_track != cdp->nr_track) { -+ if (cdp->track_info) -+ g_free(cdp->track_info); -+ cdp->nr_track = nr_track; -+ cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t)); -+ } -+ for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) { -+ tocentry.track = j; -+ tocentry.address_format = CD_MSF_FORMAT; -+ -+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ /* fill the trackinfo field */ -+ cdp->track_info[i].track = j; -+ cdp->track_info[i].audio_track = tocentry.entry.control != -+ 0x04 ? 1 : 0; -+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf); -+ } -+ -+ tocentry.track = 0xAA; -+ tocentry.address_format = CD_MSF_FORMAT; -+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ cdp->track_info[i].track = j; -+ cdp->track_info[i].audio_track = 0; -+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf); -+ -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat) -+{ -+ struct ioc_read_subchannel subchnl; -+ struct cd_sub_channel_info subchnlinfo; -+ -+ subchnl.address_format = CD_MSF_FORMAT; -+ subchnl.data_format = CD_CURRENT_POSITION; -+ subchnl.track = 0; -+ subchnl.data_len = sizeof(subchnlinfo); -+ subchnl.data = &subchnlinfo; -+ if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ stat->track = subchnlinfo.what.position.track_number; -+ ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf); -+ ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf); -+ switch (subchnlinfo.header.audio_status) { -+ case CD_AS_PLAY_IN_PROGRESS: -+ ioctl(cdp->device, CDIOCPREVENT); -+ stat->audio_status = DISC_PLAY; -+ break; -+ case CD_AS_PLAY_PAUSED: -+ ioctl(cdp->device, CDIOCPREVENT); -+ stat->audio_status = DISC_PAUSED; -+ break; -+ case CD_AS_PLAY_COMPLETED: -+ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR) -+ return DISC_IO_ERROR; -+ stat->track = cdp->nr_track; -+ ASSIGN_MSF(stat->relative_address, -+ cdp->track_info[cdp->nr_track].address); -+ ASSIGN_MSF(stat->absolute_address, -+ cdp->track_info[cdp->nr_track].address); -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_COMPLETED; -+ break; -+ case CD_AS_AUDIO_INVALID: -+ case CD_AS_NO_STATUS: -+ case CD_AS_PLAY_ERROR: -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_STOP; -+ break; -+ default: -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_ERROR; -+ } -+ return (stat->audio_status == DISC_ERROR ? -+ DISC_IO_ERROR : DISC_NO_ERROR); -+} -+ -+cdrom_device_t -+cdrom_open(char *device, int *errcode) -+{ -+ cdrom_device_t cdp; -+ -+ cdp = g_malloc(sizeof(struct cdrom_device)); -+ -+ cdp->device = open(device, O_RDONLY); -+ if (cdp->device == -1) { -+ *errcode = errno; -+ g_free(cdp); -+ return NULL; -+ } -+ cdp->nr_track = 0; -+ cdp->track_info = NULL; -+ return cdp; -+} -+ -+void -+cdrom_close(cdrom_device_t cdp) -+{ -+ if (cdp->nr_track) -+ g_free(cdp->track_info); -+ close(cdp->device); -+ g_free(cdp); -+} -+ -+int -+cdrom_load(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCCLOSE) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_eject(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCEJECT) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_next(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ return cdrom_play(cdp, stat.track + 1, cdp->track1); -+} -+ -+int -+cdrom_prev(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ return cdrom_play(cdp, stat.track - 1, cdp->track1); -+} -+ -+int -+cdrom_rewind(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ int track; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ if (stat.absolute_address.second != 0) -+ stat.absolute_address.second--; -+ else { -+ stat.absolute_address.second = 0; -+ if (stat.absolute_address.minute > 0) -+ stat.absolute_address.minute--; -+ } -+ stat.absolute_address.frame = 0; -+ return cdrom_play_msf(cdp, &stat.absolute_address); -+} -+ -+int -+cdrom_ff(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ int track; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ stat.absolute_address.second++; -+ if (stat.absolute_address.second >= 60) { -+ stat.absolute_address.minute++; -+ stat.absolute_address.second = 0; -+ } -+ stat.absolute_address.frame = 0; -+ return cdrom_play_msf(cdp, &stat.absolute_address); -+} -+ -+int -+cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length) -+{ -+ int index, s1, s2, i; -+ -+ if ((track < cdp->track0) || (track > cdp->track1)) -+ return DISC_INDEX_OUT_OF_RANGE; -+ index = track - cdp->track0; -+ -+ s1 = cdp->track_info[index + 1].address.second; -+ s2 = cdp->track_info[index].address.second; -+ length->second = s1 = s1 - s2; -+ if (s1 < 0) { -+ i = 1; -+ length->second = s1 + 60; -+ } else -+ i = 0; -+ -+ length->minute = cdp->track_info[index + 1].address.minute - -+ cdp->track_info[index].address.minute - i; -+ -+ return 0; -+} diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi index 4025a9a360f1..ebaa93f7e670 100644 --- a/x11/gnome-applets/files/patch-battstat-acpi +++ b/x11/gnome-applets/files/patch-battstat-acpi @@ -1,58 +1,3 @@ ---- battstat/Makefile.in.orig Mon Sep 27 18:39:44 2004 -+++ battstat/Makefile.in Mon Sep 27 18:40:56 2004 -@@ -173,6 +173,8 @@ - pixmapsdir = $(datadir)/pixmaps - pixmaps_DATA = battstat.png - -+ACPIINC = @ACPIINC@ -+ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a - @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm - @NEED_LIBAPM_FALSE@APMLIB = -@@ -191,6 +193,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DDATA_DIR=\"$(datadir)\" \ - -DGLADE_DIR=\"$(gladedir)\" \ - -DG_LOG_DOMAIN=\"battstat_applet\" \ -@@ -205,7 +208,9 @@ - properties.c \ - battstat_applet.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - - battstat_applet_2_LDADD = \ -@@ -242,7 +247,7 @@ - PROGRAMS = $(libexec_PROGRAMS) - - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ -- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) -+ battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a -@@ -259,6 +264,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -330,6 +336,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ - --- battstat/acpi-freebsd.h.orig Mon Sep 27 18:39:30 2004 +++ battstat/acpi-freebsd.h Mon Sep 27 18:39:30 2004 @@ -0,0 +1,45 @@ @@ -101,9 +46,171 @@ +void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + +#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/acpi-freebsd.c.orig Tue Sep 28 16:55:52 2004 -+++ battstat/acpi-freebsd.c Tue Sep 28 17:00:32 2004 -@@ -0,0 +1,213 @@ +--- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 ++++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 +@@ -55,9 +55,10 @@ + PROGRAMS = $(libexec_PROGRAMS) + am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ + battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ +- acpi-linux.$(OBJEXT) ++ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) + battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) + am__DEPENDENCIES_1 = ++ACPIINC = @ACPIINC@ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a + battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@@ -66,6 +67,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po +@@ -336,6 +338,7 @@ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(APMINC) \ ++ $(ACPIINC) \ + -DG_LOG_DOMAIN=\"battstat_applet\" + + battstat_applet_2_SOURCES = \ +@@ -345,7 +348,9 @@ + battstat_applet.c \ + power-management.c \ + acpi-linux.c \ +- acpi-linux.h ++ acpi-linux.h \ ++ acpi-freebsd.c \ ++ acpi-freebsd.h + + battstat_applet_2_LDADD = \ + $(GNOME_APPLETS_LIBS) \ +@@ -439,6 +444,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ +--- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 ++++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 +@@ -953,6 +953,7 @@ + "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", + "Davyd Madeley <davyd@madeley.id.au>", + "Ryan Lortie <desrt@desrt.ca>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", + NULL + }; + +--- battstat/power-management.c.orig Thu Jan 13 23:06:40 2005 ++++ battstat/power-management.c Wed Feb 16 02:58:10 2005 +@@ -76,6 +76,14 @@ + #ifdef __FreeBSD__ + + #include <machine/apm_bios.h> ++#include "acpi-freebsd.h" ++ ++struct acpi_info acpiinfo; ++gboolean using_acpi; ++int acpi_count; ++struct apm_info apminfo; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); + + #define APMDEVICE "/dev/apm" + +@@ -86,32 +94,48 @@ + FreeBSD. Each time this functions is called (once every second) + the APM device is opened, read from and then closed. + */ +- struct apm_info apminfo; + int fd; + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- fd = open(APMDEVICE, O_RDONLY); +- if (fd == -1) +- { +- pm_initialised = 0; +- return ERR_OPEN_APMDEV; ++ if (using_acpi) { ++ fd = -1; ++ if (acpi_count <= 0) { ++ acpi_count = 30; ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ acpi_count--; + } ++ else { ++ fd = open(APMDEVICE, O_RDONLY); ++ if (fd == -1) { ++ return ERR_OPEN_APMDEV; ++ } + +- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) +- err(1, "ioctl(APMIO_GETINFO)"); ++ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) ++ err(1, "ioctl(APMIO_GETINFO)"); + +- close(fd); ++ close(fd); + +- if(apminfo.ai_status == 0) +- return ERR_APM_E; ++ if(apminfo.ai_status == 0) ++ return ERR_APM_E; ++ ++ } ++ ++ if (using_acpi) { ++ acpi_process_event(&acpiinfo); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } + + status->present = TRUE; + status->on_ac_power = apminfo.ai_acline ? 1 : 0; + status->state = apminfo.ai_batt_stat; + status->percent = apminfo.ai_batt_life; + status->charging = (status->state == 3) ? TRUE : FALSE; +- status->minutes = apminfo.ai_batt_time; ++ if (using_acpi) ++ status->minutes = apminfo.ai_batt_time; ++ else ++ status->minutes = (int) (apminfo.ai_batt_time/60.0); + + return NULL; + } +@@ -339,6 +363,13 @@ + G_IO_IN | G_IO_ERR | G_IO_HUP, + acpi_callback, NULL); + } ++#elif defined(__FreeBSD__) ++ if (acpi_freebsd_init(&acpiinfo)) { ++ using_acpi = TRUE; ++ acpi_count = 0; ++ } ++ else ++ using_acpi = FALSE; + #endif + pm_initialised = 1; + +@@ -360,6 +391,10 @@ + g_source_remove(acpiwatch); + acpiwatch = 0; + acpi_linux_cleanup(&acpiinfo); ++ } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ acpi_freebsd_cleanup(&acpiinfo); + } + #endif + +--- battstat/acpi-freebsd.c.orig Mon Feb 28 01:41:08 2005 ++++ battstat/acpi-freebsd.c Mon Feb 28 03:00:11 2005 +@@ -0,0 +1,206 @@ +/* battstat A GNOME battery meter for laptops. + * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> + * @@ -121,7 +228,7 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * -+ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $ ++ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ + */ + +/* @@ -147,7 +254,6 @@ +#include <glib.h> + +#include <dev/acpica/acpiio.h> -+#include <contrib/dev/acpica/acpi.h> + +#include "acpi-freebsd.h" + @@ -300,160 +406,14 @@ + } + apminfo->ai_batt_life = life; + if (!charging) { -+ apminfo->ai_batt_time = time * 60; ++ apminfo->ai_batt_time = time; + } + else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60); ++ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); + } + else -+ /* This multiplication is a hack to make sure the -1 survives so the applet -+ * can process it. Battstat wants the remaining time in minutes, but -+ * ai_batt_time is in seconds. In order to make both ACPI and APM work -+ * with the fewest amount of hacks, we will just assume everything is -+ * in seconds. -+ */ -+ apminfo->ai_batt_time = -1 * 60; ++ apminfo->ai_batt_time = -1; + + return TRUE; +} +#endif ---- battstat/battstat_applet.c.orig Mon Sep 13 04:33:31 2004 -+++ battstat/battstat_applet.c Fri Oct 1 16:46:01 2004 -@@ -62,6 +62,9 @@ - #ifdef __linux__ - #include "acpi-linux.h" - #endif -+#ifdef __FreeBSD__ -+#include "acpi-freebsd.h" -+#endif - - #ifndef gettext_noop - #define gettext_noop(String) (String) -@@ -237,6 +240,24 @@ - #endif - - #ifdef __FreeBSD__ -+struct acpi_info acpiinfo; -+gboolean using_acpi; -+int acpi_count; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); -+ -+gboolean acpi_callback (gpointer data) -+{ -+ ProgressData * battstat = (ProgressData *) data; -+ -+ if (acpi_process_event(&acpiinfo)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ pixmap_timeout(data); -+ } -+ -+ return TRUE; -+} -+ - void - apm_readinfo (PanelApplet *applet, ProgressData * battstat) - { -@@ -247,13 +268,22 @@ - int fd; - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) cleanup (applet, 1); -+ if (using_acpi) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else { -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) cleanup (applet, 1); - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); -+ } - } - #elif defined(__NetBSD__) || defined(__OpenBSD__) - void -@@ -361,7 +391,7 @@ - - #ifdef __FreeBSD__ - acline_status = apminfo.ai_acline ? 1 : 0; -- time = apminfo.ai_batt_time; -+ time = (int) (apminfo.ai_batt_time / 60); - batt_life = apminfo.ai_batt_life; - #elif defined (__NetBSD__) || defined(__OpenBSD__) - acline_status = apminfo.ac_state ? 1 : 0; -@@ -375,8 +405,10 @@ - - if (batt_life > 100) batt_life = 100; - -- hours = time / 60; -- mins = time % 60; -+ if (time >= 0) { -+ hours = time / 60; -+ mins = time % 60; -+ } - - if (acline_status && batt_life == 100) - return g_strdup_printf (_("Battery charged (%d%%)"), batt_life); -@@ -912,6 +944,13 @@ - pdata->acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); - } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (pdata->acpiwatch != 0) -+ g_source_remove(pdata->acpiwatch); -+ pdata->acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); -+ } - #endif - - if (pdata->suspend_cmd) -@@ -1052,6 +1091,7 @@ - "Lennart Poettering <lennart@poettering.de> (Linux ACPI support)", - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@ucc.asn.au>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - -@@ -1760,11 +1800,18 @@ - using_acpi = TRUE; - acpi_count = 0; - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; - #endif - apm_readinfo (applet, NULL); - - #ifdef __FreeBSD__ -- if(apminfo.ai_status == 0) cleanup (applet, 2); -+ if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2); - #endif - - battstat = g_new0 (ProgressData, 1); -@@ -1803,6 +1850,10 @@ - battstat->acpiwatch = g_io_add_watch (acpiinfo.channel, - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, battstat); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat); - } - #endif - diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in index ecaea9dab09e..a6bed2361540 100644 --- a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in +++ b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in @@ -5,7 +5,7 @@ <owner>battstat-applet</owner> <type>string</type> - <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/apm -s</default> ++ <default>/usr/sbin/zzz</default> <locale name="C"> <short>Suspend Command</short> <long>Command to send to suspend the computer</long> diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd new file mode 100644 index 000000000000..48f2ebb6c5b1 --- /dev/null +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -0,0 +1,514 @@ +--- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 ++++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 +@@ -55,6 +55,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -68,6 +69,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ +@@ -336,6 +338,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -419,6 +422,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ +--- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 ++++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifndef __CPUFREQ_MONITOR_SYSCTL_H__ ++#define __CPUFREQ_MONITOR_SYSCTL_H__ ++ ++#include <glib-object.h> ++#include "cpufreq-monitor.h" ++ ++#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ()) ++#define CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl)) ++#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++#define IS_CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++ ++typedef struct _CPUFreqMonitorSysctl CPUFreqMonitorSysctl; ++typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass; ++ ++struct _CPUFreqMonitorSysctl { ++ CPUFreqMonitor parent; ++}; ++ ++struct _CPUFreqMonitorSysctlClass { ++ CPUFreqMonitorClass parent_class; ++}; ++ ++GType cpufreq_monitor_sysctl_get_type (); ++CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); ++ ++#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 +@@ -22,6 +22,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + + #include "cpufreq-monitor-cpuinfo.h" +@@ -102,6 +106,7 @@ + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -109,6 +114,9 @@ + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -118,6 +126,7 @@ + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -178,6 +187,12 @@ + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 +@@ -16,13 +16,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -30,6 +38,7 @@ + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -48,6 +57,20 @@ + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 ++++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 +@@ -0,0 +1,269 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#include <glib.h> ++#include <glib/gi18n.h> ++ ++#include <string.h> ++ ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++ ++#include "cpufreq-monitor-sysctl.h" ++#include "cpufreq-monitor-protected.h" ++ ++#define PARENT_TYPE TYPE_CPUFREQ_MONITOR ++ ++#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected)) ++ ++static void cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass); ++static void cpufreq_monitor_sysctl_finalize (GObject *object); ++ ++static void cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor); ++static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor); ++ ++static gboolean cpufreq_monitor_sysctl_get (gpointer gdata); ++ ++ ++static CPUFreqMonitorClass *parent_class = NULL; ++ ++typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected; ++ ++GType cpufreq_monitor_sysctl_get_type () ++{ ++ static GType type = 0; ++ ++ if (!type) { ++ static const GTypeInfo info = { ++ sizeof (CPUFreqMonitorSysctlClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cpufreq_monitor_sysctl_class_init, ++ NULL, ++ NULL, ++ sizeof (CPUFreqMonitorSysctl), ++ 0, ++ NULL ++ }; ++ ++ type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static void ++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass); ++ ++ parent_class = g_type_class_peek_parent (klass); ++ ++ monitor_class->run = cpufreq_monitor_sysctl_run; ++ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies; ++ ++ object_class->finalize = cpufreq_monitor_sysctl_finalize; ++} ++ ++static void ++cpufreq_monitor_sysctl_finalize (GObject *object) ++{ ++ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object)); ++ ++ if (G_OBJECT_CLASS (parent_class)->finalize) ++ (* G_OBJECT_CLASS (parent_class)->finalize) (object); ++} ++ ++CPUFreqMonitor * ++cpufreq_monitor_sysctl_new (guint cpu) ++{ ++ CPUFreqMonitorSysctl *monitor; ++ ++ monitor = g_object_new (TYPE_CPUFREQ_MONITOR_SYSCTL, "cpu", cpu, NULL); ++ ++ return CPUFREQ_MONITOR (monitor); ++} ++ ++static gboolean ++cpufreq_monitor_sysctl_get (gpointer gdata) ++{ ++ gint fmax, fmin, ifreq; ++ gchar *freq, *perc, *unit, *governor; ++ gboolean changed; ++ size_t len; ++ gchar *freq_oid; ++ CPUFreqMonitorSysctl *monitor; ++ CPUFreqMonitorProtected *private; ++ ++ monitor = (CPUFreqMonitorSysctl *) gdata; ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->available_freqs == NULL) { ++ if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor))) ++ return FALSE; ++ } ++ ++ fmax = atoi ((gchar *) private->available_freqs->data); ++ fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1))); ++ ++ len = sizeof (ifreq); ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu); ++ ++ if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) { ++ g_free (freq_oid); ++ return FALSE; ++ } ++ ++ ifreq *= 1000; ++ ++ if (ifreq == fmax) ++ governor = g_strdup ("performance"); ++ else if (ifreq == fmin) ++ governor = g_strdup ("economy"); ++ else ++ governor = g_strdup ("other"); ++ ++ freq = parent_class->get_human_readable_freq (ifreq); ++ perc = parent_class->get_human_readable_perc (fmax, ifreq); ++ unit = parent_class->get_human_readable_unit (ifreq); ++ ++ changed = FALSE; ++ ++ if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) { ++ changed = TRUE; ++ } ++ ++ parent_class->free_data (CPUFREQ_MONITOR (monitor)); ++ ++ private->governor = governor; ++ private->freq = freq; ++ private->perc = perc; ++ private->unit = unit; ++ ++ if (private->governor == NULL) ++ return FALSE; ++ if (private->freq == NULL) ++ return FALSE; ++ if (private->perc == NULL) ++ return FALSE; ++ if (private->unit == NULL) ++ return FALSE; ++ ++ if (changed) ++ g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0); ++ ++ return TRUE; ++} ++ ++static void ++cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor) ++{ ++ CPUFreqMonitorProtected *private; ++ ++ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor)); ++ ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->timeout_handler > 0) ++ g_source_remove (private->timeout_handler); ++ ++ private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor); ++} ++ ++static void ++free_string (gpointer str, gpointer gdata) ++{ ++ if (str) g_free (str); ++} ++ ++static GList * ++cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor) ++{ ++ CPUFreqMonitorProtected *private; ++ gchar *levels_oid, *levels; ++ gchar **levelsp, **l; ++ gint mib[4]; ++ size_t len; ++ ++ g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL); ++ ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->available_freqs) { ++ g_list_foreach (private->available_freqs, ++ free_string, NULL); ++ g_list_free (private->available_freqs); ++ private->available_freqs = NULL; ++ } ++ ++ levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels", ++ private->cpu); ++ len = 4; ++ sysctlnametomib (levels_oid, mib, &len); ++ len = sizeof (levels); ++ g_free (levels_oid); ++ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) ++ return NULL; ++ ++ levels = g_malloc (len); ++ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) ++ return NULL; ++ ++ levelsp = g_strsplit (levels, " ", 0); ++ g_free (levels); ++ ++ for (l = levelsp; l && *l; l++) { ++ gchar **frpr; ++ ++ frpr = g_strsplit (*l, "/", 0); ++ if (frpr && frpr[0] != NULL) { ++ /* sysctl format is %d/%d where the ++ * first %d is the frequency, and ++ * the second is the power used in ++ * mW. ++ */ ++ int freq = atoi (frpr[0]); ++ private->available_freqs = ++ g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000)); ++ } ++ g_strfreev (frpr); ++ } ++ ++ g_strfreev (levelsp); ++ ++ return private->available_freqs; ++} ++#endif /* __FreeBSD__ */ +--- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 ++++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 +@@ -16,6 +16,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <config.h> +@@ -25,6 +26,10 @@ + #include <panel-applet-gconf.h> + #include <glade/glade.h> + #include <glib/gi18n.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + + #include "cpufreq-applet.h" +@@ -192,6 +197,7 @@ + { + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -231,6 +237,7 @@ + cpufreq_applet_get_max_cpu () + { + gint mcpu = -1; ++#ifndef __FreeBSD__ + gchar *file = NULL; + + do { +@@ -253,6 +260,14 @@ + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#else ++ size_t len; ++ ++ len = sizeof (mcpu); ++ ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; ++#endif /* __FreeBSD__ */ + + if (mcpu >= 0) + return mcpu; diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd new file mode 100644 index 000000000000..f577a0fed39b --- /dev/null +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -0,0 +1,373 @@ +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 +@@ -53,7 +53,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -61,6 +61,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -310,6 +311,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -385,6 +387,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +--- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 ++++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifndef __CPUFREQ_SYSCTL_H__ ++#define __CPUFREQ_SYSCTL_H__ ++ ++#include <glib-object.h> ++ ++#include "cpufreq.h" ++ ++#define TYPE_CPUFREQ_SYSCTL (cpufreq_sysctl_get_type ()) ++#define CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl)) ++#define CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) ++#define IS_CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL)) ++#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL)) ++#define CPUFREQ_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) ++ ++typedef struct _CPUFreqSysctl CPUFreqSysctl; ++typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass; ++typedef struct _CPUFreqSysctlPriv CPUFreqSysctlPriv; ++ ++struct _CPUFreqSysctl { ++ CPUFreq parent; ++}; ++ ++struct _CPUFreqSysctlClass { ++ CPUFreqClass parent_class; ++}; ++ ++ ++GType cpufreq_sysctl_get_type (); ++CPUFreqSysctl *cpufreq_sysctl_new (); ++ ++#endif /* __CPUFREQ_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 ++++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 +@@ -16,6 +16,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -35,6 +39,9 @@ + gulong frequency = 0; + poptContext ctx; + gint nextopt; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + CPUFreq *cfq; + + struct poptOption options[] = { +@@ -76,10 +83,15 @@ + + poptFreeContext(ctx); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD __ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 ++++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 +@@ -0,0 +1,235 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ ++ ++#include "cpufreq-sysctl.h" ++ ++#define PARENT_TYPE TYPE_CPUFREQ ++ ++#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate)) ++ ++static void cpufreq_sysctl_init (CPUFreqSysctl *cfq); ++static void cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass); ++static void cpufreq_sysctl_finalize (GObject *object); ++ ++static void cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor); ++static void cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency); ++ ++static void cpufreq_sysctl_setup (CPUFreqSysctl *cfq); ++ ++static GObjectClass *parent_class = NULL; ++ ++typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate; ++ ++struct _CPUFreqSysctlPrivate ++{ ++ gint pmax; ++}; ++ ++GType cpufreq_sysctl_get_type () ++{ ++ static GType type = 0; ++ ++ if (!type) { ++ static const GTypeInfo info = { ++ sizeof (CPUFreqSysctlClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cpufreq_sysctl_class_init, ++ NULL, ++ NULL, ++ sizeof (CPUFreqSysctl), ++ 0, ++ (GInstanceInitFunc) cpufreq_sysctl_init ++ }; ++ ++ type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static void ++cpufreq_sysctl_init (CPUFreqSysctl *cfq) ++{ ++ CPUFreqSysctlPrivate *private; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); ++} ++ ++static void ++cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass); ++ ++ parent_class = g_type_class_peek_parent (klass); ++ ++ g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate)); ++ ++ cfq_class->set_governor = cpufreq_sysctl_set_governor; ++ cfq_class->set_frequency = cpufreq_sysctl_set_frequency; ++ ++ object_class->finalize = cpufreq_sysctl_finalize; ++} ++ ++static void ++cpufreq_sysctl_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (parent_class)->finalize) ++ (* G_OBJECT_CLASS (parent_class)->finalize) (object); ++} ++ ++CPUFreqSysctl * ++cpufreq_sysctl_new () ++{ ++ CPUFreqSysctl *cfq; ++ ++ cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL); ++ ++ cpufreq_sysctl_setup (cfq); ++ ++ return cfq; ++} ++ ++static void ++cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor) ++{ ++ /* Not implemented. */ ++} ++ ++static void ++cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency) ++{ ++ gint cpu, i; ++ size_t len; ++ gchar *freq_oid; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL); ++ ++ frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/ ++ ++ for (i = 0; i < cpu; i++) { ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i); ++ ++ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency)); ++ g_free (freq_oid); ++ } ++} ++ ++ ++static void ++cpufreq_sysctl_setup (CPUFreqSysctl *cfq) ++{ ++ guint cpu; ++ gint fmax, fmin; ++ gint pmax; ++ gint ifreq; ++ gint mib[4]; ++ gchar *governor, *levels; ++ gchar **levelsp, **frpr, **l; ++ size_t len; ++ CPUFreqSysctlPrivate *private; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); ++ ++ pmax = 100; ++ fmax = 0; ++ fmin = 0; ++ ifreq = 0; ++ ++ private->pmax = pmax; ++ ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1) ++ cpu = 1; ++ ++ len = 4; ++ sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len); ++ len = sizeof (levels); ++ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch dev.cpu.0.freq_levels"); ++ return; ++ } ++ ++ levels = g_malloc (len); ++ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch data for dev.cpu.0.freq_levels"); ++ return; ++ } ++ ++ levelsp = g_strsplit (levels, " ", 0); ++ g_free (levels); ++ ++ frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */ ++ if (frpr && frpr[0] != NULL) ++ fmax = atoi (frpr[0]); ++ g_strfreev (frpr); ++ ++ for (l = levelsp; l && *l; l++) /* Walk to the last frequency */ ++ ; ++ ++ l --; ++ frpr = g_strsplit (*l, "/", 0); ++ if (frpr && frpr[0] != NULL) ++ fmin = atoi (frpr[0]); ++ ++ g_strfreev (frpr); ++ g_strfreev (levelsp); ++ ++ len = sizeof (ifreq); ++ if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch data for dev.cpu.0.freq"); ++ return; ++ } ++ ++ if (ifreq == fmax) ++ governor = g_strdup ("performance"); ++ else if (ifreq == fmin) ++ governor = g_strdup ("economy"); ++ else ++ governor = g_strdup ("other"); ++ ++ fmax *= 1000; ++ fmin *= 1000; ++ ++ g_object_set (G_OBJECT (cfq), "n_cpu", cpu, ++ "sc_max", fmax, "sc_min", fmin, ++ "governor", governor, NULL); ++ ++ g_free (governor); ++} diff --git a/x11/gnome-applets/files/patch-gkb-new_presets.c b/x11/gnome-applets/files/patch-gkb-new_presets.c deleted file mode 100644 index f90708170e00..000000000000 --- a/x11/gnome-applets/files/patch-gkb-new_presets.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gkb-new/preset.c.orig Fri Mar 14 09:13:44 2003 -+++ gkb-new/preset.c Fri Mar 14 09:13:54 2003 -@@ -42,7 +42,7 @@ - - /* TODO: user's local presets */ - -- text = gnome_unconditional_datadir_file ("gnome/gkb/"); -+ text = gnome_unconditional_datadir_file ("gkb/"); - if (!text) - return NULL; - dir = opendir (text); diff --git a/x11/gnome-applets/files/patch-gweather_weather-iwin.c b/x11/gnome-applets/files/patch-gweather_weather-iwin.c new file mode 100644 index 000000000000..14c0190b2eed --- /dev/null +++ b/x11/gnome-applets/files/patch-gweather_weather-iwin.c @@ -0,0 +1,9 @@ +--- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004 ++++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004 +@@ -1,5 +1,6 @@ + /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */ + ++#include <sys/types.h> + #include <regex.h> + #include <gnome.h> + #include "weather.h" diff --git a/x11/gnome-applets/files/patch-gweather_weather.c b/x11/gnome-applets/files/patch-gweather_weather.c new file mode 100644 index 000000000000..cdc1921ab4c7 --- /dev/null +++ b/x11/gnome-applets/files/patch-gweather_weather.c @@ -0,0 +1,12 @@ +--- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 ++++ gweather/weather.c Tue Mar 1 12:36:54 2005 +@@ -20,7 +20,9 @@ + #include <string.h> + #include <ctype.h> + #include <math.h> ++#ifndef __FreeBSD__ + #include <values.h> ++#endif + + #ifdef __FreeBSD__ + #include <sys/types.h> diff --git a/x11/gnome-applets/files/patch-modemlights_Makefile.in b/x11/gnome-applets/files/patch-modemlights_Makefile.in new file mode 100644 index 000000000000..874884722127 --- /dev/null +++ b/x11/gnome-applets/files/patch-modemlights_Makefile.in @@ -0,0 +1,10 @@ +--- modemlights/Makefile.in.orig Fri Jan 14 00:08:52 2005 ++++ modemlights/Makefile.in Fri Jan 14 00:09:20 2005 +@@ -319,6 +319,7 @@ + modem_applet_LDADD = \ + $(GNOME_APPLETS_LIBS) \ + $(LIBGLADE_LIBS) \ ++ -lutil \ + $(MODEMLIGHTS_LIBS) + + uidir = $(datadir)/gnome-2.0/ui diff --git a/x11/gnome-applets/files/patch-modemlights_modem-applet.c b/x11/gnome-applets/files/patch-modemlights_modem-applet.c new file mode 100644 index 000000000000..f4fb13717732 --- /dev/null +++ b/x11/gnome-applets/files/patch-modemlights_modem-applet.c @@ -0,0 +1,22 @@ +--- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 ++++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 +@@ -24,12 +24,19 @@ + + #include <panel-applet.h> + #include <fcntl.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#endif + #include <sys/poll.h> + #include <sys/types.h> + #include <sys/wait.h> + #include <libxml/tree.h> + #include <glade/glade.h> ++#ifdef __FreeBSD__ ++#include <sys/ioctl.h> ++#include <termios.h> ++#include <libutil.h> ++#endif + + #include "modem-applet.h" + diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c deleted file mode 100644 index 636b36b21cb9..000000000000 --- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c +++ /dev/null @@ -1,349 +0,0 @@ ---- wireless/wireless-applet.c.orig Sat Oct 30 09:46:28 2004 -+++ wireless/wireless-applet.c Mon Dec 6 21:24:29 2004 -@@ -30,12 +30,25 @@ - #include <math.h> - #include <dirent.h> - -+#ifdef __FreeBSD__ -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - #include <gnome.h> - #include <panel-applet.h> - #include <panel-applet-gconf.h> - #include <glade/glade.h> - -+#ifdef __FreeBSD__ -+#define CFG_DEVICE "an0" -+#else - #define CFG_DEVICE "eth0" -+#endif - #define CFG_UPDATE_INTERVAL 2 - - typedef enum { -@@ -92,6 +105,12 @@ - WirelessApplet *applet); - static void wireless_applet_about_cb (BonoboUIComponent *uic, - WirelessApplet *applet); -+#ifdef __FreeBSD__ -+static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); -+static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); -+static void get_wi_data(WirelessApplet *applet, char *device, long int *level); -+#endif - static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data); - - static const BonoboUIVerb wireless_menu_verbs [] = { -@@ -159,9 +178,11 @@ - g_free (tltp); - - /* Update the image */ -+#ifndef __FreeBSD__ - percent = CLAMP (percent, -1, 100); -+#endif - -- if (percent < 0) -+ if (percent < 0 || percent > 100) - state = PIX_BROKEN; - else if (percent == 0) - state = PIX_NO_LINK; -@@ -192,6 +213,7 @@ - int percent; - - /* Calculate the percentage based on the link quality */ -+#ifndef __FreeBSD__ - if (level < 0) { - percent = -1; - } else { -@@ -202,6 +224,9 @@ - percent = CLAMP (percent, 0, 100); - } - } -+#else -+ percent = (int)level; -+#endif - - wireless_applet_draw (applet, percent); - } -@@ -244,14 +269,179 @@ - } - } - -+#ifdef __FreeBSD__ -+static int -+wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ bzero((char *)&ifr, sizeof(ifr)); -+ -+ strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t)wreq; -+ -+ s = socket(AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) -+ { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "Socket Error", -+ NULL); -+ return 0; -+ } -+ -+ if (ioctl(s, SIOCGWAVELAN, &ifr) == -1) -+ { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); -+ close (s); -+ return 0; -+ } -+ -+ close(s); -+ -+ return 1; -+} -+ -+static void -+get_wi_data (WirelessApplet *applet, char *device, long int *level) -+{ -+ struct wi_req wreq; -+ long int signal_strength; -+ -+ bzero((char *)&wreq, sizeof(wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ (void)wi_getval(applet, device, &wreq); -+ -+ signal_strength = (long int) (wreq.wi_val[1]); -+ -+#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time(NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ (void)wi_getval(applet, device, &wreq); -+ -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } -+#endif -+ -+ memcpy(level, &signal_strength, sizeof( *level )); -+ -+ return; -+} -+ -+static int -+an_getval(WirelessApplet *applet, char *device, struct an_req *areq) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ bzero((char *)&ifr, sizeof(ifr)); -+ -+ strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t)areq; -+ -+ s = socket(AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "Socket Error", -+ NULL); -+ return 0; -+ } -+ -+ if (ioctl(s, SIOCGAIRONET, &ifr) == -1) { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); -+ close (s); -+ return 0; -+ } -+ -+ close(s); -+ return 1; -+} -+ -+static void -+get_an_data (WirelessApplet *applet, char *device, long int *level) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ long int signal_strength; -+ int rssimap_valid = 0; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof(an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = an_getval(applet, device, (struct an_req*)&an_rssimap); -+#endif -+ -+ areq.an_len = sizeof(areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ (void)an_getval(applet, device, &areq); -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ signal_strength = (long int)(an_rssimap.an_entries[ -+ sts->an_normalized_strength].an_rss_pct); -+ else -+ signal_strength = (long int)(sts->an_normalized_strength); -+#else -+ signal_strength = (long int)(sts->an_normalized_rssi); -+#endif -+ memcpy(level, &signal_strength, sizeof(level)); -+} -+#endif -+ - /* check stats, modify the state attribute */ - static void - wireless_applet_read_device_state (WirelessApplet *applet) - { -- long int level, noise; -- double link; -+ long int level; - char device[256]; -+#ifdef __FreeBSD__ -+ struct if_nameindex *ifstart, *ifs; -+#else -+ long int noise; -+ double link; - char line[256]; -+#endif - gboolean found = FALSE; - - /* resest list of available wireless devices */ -@@ -259,8 +449,37 @@ - g_list_free (applet->devices); - applet->devices = NULL; - -+#ifdef __FreeBSD__ -+ ifs = ifstart = if_nameindex (); -+#endif -+ - /* Here we begin to suck... */ - do { -+#ifdef __FreeBSD__ -+ if (ifs == NULL || ifs->if_name == NULL) { -+ break; -+ } -+ strlcpy (device, ifs->if_name, 6); -+ if (g_strncasecmp (device, "an", 2)==0) { -+ applet->devices = g_list_prepend (applet->devices, g_strdup (device)); -+ if (g_strcasecmp (applet->device, device)==0) { -+ get_an_data (applet, device, &level); -+ wireless_applet_update_state (applet, device, 0, level, 0); -+ found = TRUE; -+ } -+ } -+ else if (g_strncasecmp (device, "wi", 2)==0 || -+ g_strncasecmp (device, "ath", 3)==0 || -+ g_strncasecmp (device, "ndis", 4)==0) { -+ applet->devices = g_list_prepend (applet->devices, g_strdup (device)); -+ if (g_strcasecmp (applet->device, device)==0) { -+ get_wi_data (applet, device, &level); -+ wireless_applet_update_state (applet, device, 0, level, 0); -+ found = TRUE; -+ } -+ } -+ ifs++; -+#else - char *ptr; - - fgets (line, 256, applet->file); -@@ -294,6 +513,7 @@ - found = TRUE; - } - } -+#endif - } while (1); - - if (g_list_length (applet->devices)==1) { -@@ -305,17 +525,23 @@ - } - - /* rewind the /proc/net/wireless file */ -+#ifdef __FreeBSD__ -+ if_freenameindex(ifstart); -+#else - rewind (applet->file); -+#endif - } - - static int - wireless_applet_timeout_handler (WirelessApplet *applet) - { -+#ifndef __FreeBSD__ - if (applet->file == NULL) { - wireless_applet_update_state (applet, - applet->device, -1, -1, -1); - return FALSE; - } -+#endif - - wireless_applet_read_device_state (applet); - -@@ -364,10 +590,12 @@ - static void - start_file_read (WirelessApplet *applet) - { -- applet->file = fopen ("/proc/net/wireless", "rt"); -+#ifndef __FreeBSD__ -+ applet->file1 = fopen ("/proc/net/wireless", "rt"); - if (applet->file == NULL) { - show_error_dialog (applet, _("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); - } -+#endif - } - - static void -@@ -670,8 +898,10 @@ - applet->prefs = NULL; - } - -+#ifndef __FreeBSD__ - if (applet->file) - fclose (applet->file); -+#endif - if (applet->tips) - g_object_unref (applet->tips); - } diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index e3410d50878c..0f24cdc75ecc 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -1,13 +1,12 @@ -bin/gkb_xmmap -bin/gnome-keyboard-layout +%%CPUFREQ%%bin/cpufreq-selector bin/gswitchit-plugins-capplet %%BATTERY%%etc/sound/events/battstat_applet.soundlist -etc/sound/events/mailcheck.soundlist +include/libgswitchit/gswitchit_config.h include/libgswitchit/gswitchit_plugin.h -include/libgswitchit/gswitchit_xkb_config.h libdata/bonobo/servers/GNOME_AccessxStatusApplet.server %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server +%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server @@ -17,198 +16,69 @@ libdata/bonobo/servers/GNOME_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server -libdata/bonobo/servers/GNOME_ModemLightsApplet.server +libdata/bonobo/servers/GNOME_ModemLights.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +libdata/bonobo/servers/GNOME_NullApplet_Factory.server +libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server libdata/pkgconfig/gswitchit.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 -libexec/cdplayer_applet2 libexec/charpick_applet2 +%%CPUFREQ%%libexec/cpufreq-applet libexec/drivemount_applet2 libexec/geyes_applet2 libexec/gnome-applets/mc-install-default-macros libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 -libexec/mailcheck-applet libexec/mini_commander_applet +libexec/modem_applet libexec/mixer_applet2 -libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/null_applet libexec/stickynotes_applet -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 -share/gnome/geyes/Bloodshot/Bloodshot-eye.png -share/gnome/geyes/Bloodshot/Bloodshot-pupil.png -share/gnome/geyes/Bloodshot/config -share/gnome/geyes/Default-tiny/Default-tiny-eye.png -share/gnome/geyes/Default-tiny/Default-tiny-pupil.png -share/gnome/geyes/Default-tiny/config -share/gnome/geyes/Default/Default-eye.png -share/gnome/geyes/Default/Default-pupil.png -share/gnome/geyes/Default/config -share/gnome/geyes/Horrid/config -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 -share/gnome/gkb/BG_Bulgarian.keyprop -share/gnome/gkb/BG_Bulgarian_x.keyprop -share/gnome/gkb/BR_Portuguese.keyprop -share/gnome/gkb/BR_Portuguese_x.keyprop -share/gnome/gkb/BY_Belarussian.keyprop -share/gnome/gkb/Basque.keyprop -share/gnome/gkb/Belgian.keyprop -share/gnome/gkb/BulgarianCyril.keyprop -share/gnome/gkb/CA_English.keyprop -share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CZ_Czech.keyprop -share/gnome/gkb/CZ_Czech_Slovak.keyprop -share/gnome/gkb/CZ_Czech_x.keyprop -share/gnome/gkb/DE_German.keyprop -share/gnome/gkb/DE_German_x.keyprop -share/gnome/gkb/DK_Danish.keyprop -share/gnome/gkb/DK_Danish_x.keyprop -share/gnome/gkb/Default.keyprop -share/gnome/gkb/Dvorak.keyprop -share/gnome/gkb/EE_Estonian.keyprop -share/gnome/gkb/EE_Estonian_x.keyprop -share/gnome/gkb/ES_Spanish-x86.keyprop -share/gnome/gkb/ES_Spanish.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-x86.keyprop -share/gnome/gkb/FR_French.keyprop -share/gnome/gkb/FR_French_x.keyprop -share/gnome/gkb/FrenchCanadian.keyprop -share/gnome/gkb/FrenchCanadian2.keyprop -share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GE_Georgian_x.keyprop -share/gnome/gkb/GR_Greek.keyprop -share/gnome/gkb/GR_Greek_x.keyprop -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 -share/gnome/gkb/IL_Hebrew.keyprop -share/gnome/gkb/IL_Hebrew_x.keyprop -share/gnome/gkb/IS_Icelandic.keyprop -share/gnome/gkb/IS_Icelandic_x.keyprop -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 -share/gnome/gkb/LT_Prog.keyprop -share/gnome/gkb/LT_Standard.keyprop -share/gnome/gkb/MK_Macedonian.keyprop -share/gnome/gkb/MN_Mongolian.keyprop -share/gnome/gkb/MN_Mongolian_x.keyprop -share/gnome/gkb/MN_Mongolian_x_rev.keyprop -share/gnome/gkb/MN_Mongolian_x_uni.keyprop -share/gnome/gkb/Macedonian.keyprop -share/gnome/gkb/NL_Dutch_x.keyprop -share/gnome/gkb/NO_Norwegian.keyprop -share/gnome/gkb/Norwegian.keyprop -share/gnome/gkb/PL_Polish.keyprop -share/gnome/gkb/PT_Portuguese.keyprop -share/gnome/gkb/PT_Portuguese_x.keyprop -share/gnome/gkb/Polish.keyprop -share/gnome/gkb/PolishDeadkeys.keyprop -share/gnome/gkb/Portugal.keyprop -share/gnome/gkb/PortugalDeadkeys.keyprop -share/gnome/gkb/RO_Romanian.keyprop -share/gnome/gkb/RU_Russian.keyprop -share/gnome/gkb/RU_Russian_x.keyprop -share/gnome/gkb/RU_Russian_x_rev.keyprop -share/gnome/gkb/RussianCyril.keyprop -share/gnome/gkb/SE_Swedish.keyprop -share/gnome/gkb/SE_Swedish_x.keyprop -share/gnome/gkb/SI_Slovenian.keyprop -share/gnome/gkb/SI_Slovenian_x.keyprop -share/gnome/gkb/SK__x.keyprop -share/gnome/gkb/SR_Dutch.keyprop -share/gnome/gkb/Slovak.keyprop -share/gnome/gkb/Slovene.keyprop -share/gnome/gkb/Slovenian.keyprop -share/gnome/gkb/Swedish.keyprop -share/gnome/gkb/Syriac.keyprop -share/gnome/gkb/Syriac_Phonetic.keyprop -share/gnome/gkb/TH_Thai.keyprop -share/gnome/gkb/TH_Thai_x.keyprop -share/gnome/gkb/TR-f.keyprop -share/gnome/gkb/TR-q.keyprop -share/gnome/gkb/TR_Turkish.keyprop -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-102.keyprop -share/gnome/gkb/UK-x86.keyprop -share/gnome/gkb/UK.keyprop -share/gnome/gkb/UK_English.keyprop -share/gnome/gkb/UK_English_x.keyprop -share/gnome/gkb/UK_United_Kingdom.keyprop -share/gnome/gkb/US-101.keyprop -share/gnome/gkb/US-101A-x86.keyprop -share/gnome/gkb/US-84.keyprop -share/gnome/gkb/US-dec.keyprop -share/gnome/gkb/US-ibm.keyprop -share/gnome/gkb/US-int.keyprop -share/gnome/gkb/US-mac.keyprop -share/gnome/gkb/US-sgi-101.keyprop -share/gnome/gkb/US-sun.keyprop -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_Serb_x.keyprop -share/gnome/gkb/YU_Serbo-Croatian_x.keyprop -share/gnome/gkb/Yugoslav.keyprop -share/gnome/gkb/presets.xml +libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.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 +%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml -share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml 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_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml -share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml -share/gnome/gswitchit/gswitchit-plugins.glade -share/gnome/gswitchit/gswitchit-properties.glade -share/gnome/gweather/Locations.xml +share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png +share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png +share/gnome/gnome-applets/geyes/Bizarre/config +share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png +share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png +share/gnome/gnome-applets/geyes/Bloodshot/config +share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png +share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png +share/gnome/gnome-applets/geyes/Default-tiny/config +share/gnome/gnome-applets/geyes/Default/Default-eye.png +share/gnome/gnome-applets/geyes/Default/Default-pupil.png +share/gnome/gnome-applets/geyes/Default/config +share/gnome/gnome-applets/geyes/Horrid/config +share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png +share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png +%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade +%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade +share/gnome/gnome-applets/glade/gswitchit-plugins.glade +share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/mini-commander.glade +share/gnome/gnome-applets/glade/modemlights.glade +share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/gweather/Locations.xml +share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/legal.xml @@ -216,6 +86,7 @@ share/gnome/help/accessx-status/eu/accessx-status.xml share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png share/gnome/help/accessx-status/eu/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png %%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png %%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png @@ -352,154 +223,11 @@ share/gnome/help/accessx-status/eu/legal.xml %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml -share/gnome/help/cdplayer/C/cdplayer.xml -share/gnome/help/cdplayer/C/figures/cdplayer_applet.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/de/cdplayer.xml -share/gnome/help/cdplayer/de/figures/cdplayer_applet.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/de/legal.xml -share/gnome/help/cdplayer/es/cdplayer.xml -share/gnome/help/cdplayer/es/figures/cdplayer_applet.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/eu/cdplayer.xml -share/gnome/help/cdplayer/eu/figures/cdplayer_applet.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/eu/legal.xml -share/gnome/help/cdplayer/fr/cdplayer.xml -share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/fr/legal.xml -share/gnome/help/cdplayer/it/cdplayer.xml -share/gnome/help/cdplayer/it/figures/cdplayer_applet.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/it/legal.xml -share/gnome/help/cdplayer/ja/cdplayer.xml -share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ko/cdplayer.xml -share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/ko/legal.xml -share/gnome/help/cdplayer/sv/cdplayer.xml -share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/sv/legal.xml -share/gnome/help/cdplayer/zh_CN/cdplayer.xml -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_CN/legal.xml -share/gnome/help/cdplayer/zh_HK/cdplayer.xml -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_HK/legal.xml -share/gnome/help/cdplayer/zh_TW/cdplayer.xml -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png +share/gnome/help/char-palette/C/figures/charpick-preferences.png share/gnome/help/char-palette/C/legal.xml share/gnome/help/char-palette/de/char-palette.xml share/gnome/help/char-palette/de/figures/charpalette_applet.png @@ -571,6 +299,8 @@ share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_TW/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/figures/prefs-macros.png +share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml share/gnome/help/command-line/de/command-line.xml share/gnome/help/command-line/de/figures/command-line.png @@ -605,12 +335,21 @@ share/gnome/help/command-line/zh_HK/legal.xml share/gnome/help/command-line/zh_TW/command-line.xml share/gnome/help/command-line/zh_TW/figures/command-line.png share/gnome/help/command-line/zh_TW/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml share/gnome/help/drivemount/C/drivemount.xml -share/gnome/help/drivemount/C/figures/drivemount-applet_window.png -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/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/C/figures/drivemount-applet_example.png +share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/C/figures/drivemount-applet_open.png +share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml share/gnome/help/drivemount/de/drivemount.xml share/gnome/help/drivemount/de/figures/drivemount-applet_window.png @@ -733,42 +472,6 @@ share/gnome/help/geyes/zh_TW/figures/geyes_applet.png share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml -share/gnome/help/gkb/C/figures/gkb_applet.png -share/gnome/help/gkb/C/gkb.xml -share/gnome/help/gkb/C/legal.xml -share/gnome/help/gkb/de/figures/gkb_applet.png -share/gnome/help/gkb/de/gkb.xml -share/gnome/help/gkb/de/legal.xml -share/gnome/help/gkb/es/figures/gkb_applet.png -share/gnome/help/gkb/es/gkb.xml -share/gnome/help/gkb/es/legal.xml -share/gnome/help/gkb/eu/figures/gkb_applet.png -share/gnome/help/gkb/eu/gkb.xml -share/gnome/help/gkb/eu/legal.xml -share/gnome/help/gkb/fr/figures/gkb_applet.png -share/gnome/help/gkb/fr/gkb.xml -share/gnome/help/gkb/fr/legal.xml -share/gnome/help/gkb/it/figures/gkb_applet.png -share/gnome/help/gkb/it/gkb.xml -share/gnome/help/gkb/it/legal.xml -share/gnome/help/gkb/ja/figures/gkb_applet.png -share/gnome/help/gkb/ja/gkb.xml -share/gnome/help/gkb/ja/legal.xml -share/gnome/help/gkb/ko/figures/gkb_applet.png -share/gnome/help/gkb/ko/gkb.xml -share/gnome/help/gkb/ko/legal.xml -share/gnome/help/gkb/sv/figures/gkb_applet.png -share/gnome/help/gkb/sv/gkb.xml -share/gnome/help/gkb/sv/legal.xml -share/gnome/help/gkb/zh_CN/figures/gkb_applet.png -share/gnome/help/gkb/zh_CN/gkb.xml -share/gnome/help/gkb/zh_CN/legal.xml -share/gnome/help/gkb/zh_HK/figures/gkb_applet.png -share/gnome/help/gkb/zh_HK/gkb.xml -share/gnome/help/gkb/zh_HK/legal.xml -share/gnome/help/gkb/zh_TW/figures/gkb_applet.png -share/gnome/help/gkb/zh_TW/gkb.xml -share/gnome/help/gkb/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png @@ -808,8 +511,18 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png -share/gnome/help/gweather/C/figures/gweather_settings.png -share/gnome/help/gweather/C/figures/gweather_weather.png +share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-prefs-general.png +share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/stock_weather-cloudy.png +share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/C/figures/stock_weather-fog.png +share/gnome/help/gweather/C/figures/stock_weather-night-clear.png +share/gnome/help/gweather/C/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/C/figures/stock_weather-showers.png +share/gnome/help/gweather/C/figures/stock_weather-snow.png +share/gnome/help/gweather/C/figures/stock_weather-storm.png +share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml share/gnome/help/gweather/de/figures/gweather_applet.png @@ -867,66 +580,6 @@ share/gnome/help/gweather/zh_TW/figures/gweather_settings.png share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -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/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/eu/figures/mailcheck_applet.png -share/gnome/help/mailcheck/eu/legal.xml -share/gnome/help/mailcheck/eu/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_HK/legal.xml -share/gnome/help/mailcheck/zh_HK/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml @@ -972,49 +625,9 @@ share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml -share/gnome/help/modemlights/C/figures/modemlights-advanced.png -share/gnome/help/modemlights/C/figures/modemlights-advpref.png -share/gnome/help/modemlights/C/figures/modemlights-color.png -share/gnome/help/modemlights/C/figures/modemlights-general.png -share/gnome/help/modemlights/C/figures/modemlights-prefs.png -share/gnome/help/modemlights/C/figures/modemlights.png -share/gnome/help/modemlights/C/figures/modemlights_applet.png -share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png -share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png -share/gnome/help/modemlights/C/figures/modemlights_applet_button.png -share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png -share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png -share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png -share/gnome/help/modemlights/C/figures/modemlights_applet_general.png -share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png -share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png -share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png -share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png -share/gnome/help/modemlights/C/legal.xml -share/gnome/help/modemlights/C/modemlights.xml -share/gnome/help/modemlights/eu/figures/modemlights-advanced.png -share/gnome/help/modemlights/eu/figures/modemlights-advpref.png -share/gnome/help/modemlights/eu/figures/modemlights-color.png -share/gnome/help/modemlights/eu/figures/modemlights-general.png -share/gnome/help/modemlights/eu/figures/modemlights-prefs.png -share/gnome/help/modemlights/eu/figures/modemlights.png -share/gnome/help/modemlights/eu/figures/modemlights_applet.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_advanced.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_awaiting.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_button.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_button_2.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_colors.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_connected.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_general.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_if_connect.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_not_connected.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_connecting.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_display.png -share/gnome/help/modemlights/eu/legal.xml -share/gnome/help/modemlights/eu/modemlights.xml +share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png -share/gnome/help/multiload/C/figures/system_monitor_prefs.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml share/gnome/help/multiload/de/figures/system-monitor-applet_window.png @@ -1053,6 +666,11 @@ share/gnome/help/multiload/zh_TW/legal.xml share/gnome/help/multiload/zh_TW/multiload.xml share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/de/legal.xml share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml @@ -1086,50 +704,9 @@ share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/zh_TW/legal.xml share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/wireless/C/legal.xml -share/gnome/help/wireless/C/wireless.xml -share/gnome/help/wireless/de/figures/wireless_applet_conn.png -share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/de/legal.xml -share/gnome/help/wireless/de/wireless.xml -share/gnome/help/wireless/es/figures/wireless_applet_conn.png -share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/es/legal.xml -share/gnome/help/wireless/es/wireless.xml -share/gnome/help/wireless/eu/legal.xml -share/gnome/help/wireless/eu/wireless.xml -share/gnome/help/wireless/fr/figures/wireless_applet_conn.png -share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/fr/legal.xml -share/gnome/help/wireless/fr/wireless.xml -share/gnome/help/wireless/it/figures/wireless_applet_conn.png -share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/it/legal.xml -share/gnome/help/wireless/it/wireless.xml -share/gnome/help/wireless/ja/figures/wireless_applet_conn.png -share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/ja/legal.xml -share/gnome/help/wireless/ja/wireless.xml -share/gnome/help/wireless/ko/figures/wireless_applet_conn.png -share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/ko/legal.xml -share/gnome/help/wireless/ko/wireless.xml -share/gnome/help/wireless/sv/figures/wireless_applet_conn.png -share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/sv/legal.xml -share/gnome/help/wireless/sv/wireless.xml -share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_CN/legal.xml -share/gnome/help/wireless/zh_CN/wireless.xml -share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_HK/legal.xml -share/gnome/help/wireless/zh_HK/wireless.xml -share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_TW/legal.xml -share/gnome/help/wireless/zh_TW/wireless.xml +share/gnome/help/trashapplet/C/legal.xml +share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/trashapplet.xml share/gnome/omf/gnome-applets/accessx-status-C.omf share/gnome/omf/gnome-applets/accessx-status-eu.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf @@ -1144,18 +721,6 @@ share/gnome/omf/gnome-applets/accessx-status-eu.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/cdplayer-C.omf -share/gnome/omf/gnome-applets/cdplayer-de.omf -share/gnome/omf/gnome-applets/cdplayer-es.omf -share/gnome/omf/gnome-applets/cdplayer-eu.omf -share/gnome/omf/gnome-applets/cdplayer-fr.omf -share/gnome/omf/gnome-applets/cdplayer-it.omf -share/gnome/omf/gnome-applets/cdplayer-ja.omf -share/gnome/omf/gnome-applets/cdplayer-ko.omf -share/gnome/omf/gnome-applets/cdplayer-sv.omf -share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf -share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf -share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf share/gnome/omf/gnome-applets/char-palette-C.omf share/gnome/omf/gnome-applets/char-palette-de.omf share/gnome/omf/gnome-applets/char-palette-es.omf @@ -1180,6 +745,7 @@ share/gnome/omf/gnome-applets/command-line-sv.omf share/gnome/omf/gnome-applets/command-line-zh_CN.omf share/gnome/omf/gnome-applets/command-line-zh_HK.omf share/gnome/omf/gnome-applets/command-line-zh_TW.omf +%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf share/gnome/omf/gnome-applets/drivemount-C.omf share/gnome/omf/gnome-applets/drivemount-de.omf share/gnome/omf/gnome-applets/drivemount-es.omf @@ -1204,18 +770,6 @@ share/gnome/omf/gnome-applets/geyes-sv.omf share/gnome/omf/gnome-applets/geyes-zh_CN.omf share/gnome/omf/gnome-applets/geyes-zh_HK.omf share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gkb-C.omf -share/gnome/omf/gnome-applets/gkb-de.omf -share/gnome/omf/gnome-applets/gkb-es.omf -share/gnome/omf/gnome-applets/gkb-eu.omf -share/gnome/omf/gnome-applets/gkb-fr.omf -share/gnome/omf/gnome-applets/gkb-it.omf -share/gnome/omf/gnome-applets/gkb-ja.omf -share/gnome/omf/gnome-applets/gkb-ko.omf -share/gnome/omf/gnome-applets/gkb-sv.omf -share/gnome/omf/gnome-applets/gkb-zh_CN.omf -share/gnome/omf/gnome-applets/gkb-zh_HK.omf -share/gnome/omf/gnome-applets/gkb-zh_TW.omf share/gnome/omf/gnome-applets/gswitchit-C.omf share/gnome/omf/gnome-applets/gtik2_applet2-C.omf share/gnome/omf/gnome-applets/gtik2_applet2-de.omf @@ -1241,18 +795,6 @@ share/gnome/omf/gnome-applets/gweather-sv.omf share/gnome/omf/gnome-applets/gweather-zh_CN.omf share/gnome/omf/gnome-applets/gweather-zh_HK.omf share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mailcheck-C.omf -share/gnome/omf/gnome-applets/mailcheck-de.omf -share/gnome/omf/gnome-applets/mailcheck-es.omf -share/gnome/omf/gnome-applets/mailcheck-eu.omf -share/gnome/omf/gnome-applets/mailcheck-fr.omf -share/gnome/omf/gnome-applets/mailcheck-it.omf -share/gnome/omf/gnome-applets/mailcheck-ja.omf -share/gnome/omf/gnome-applets/mailcheck-ko.omf -share/gnome/omf/gnome-applets/mailcheck-sv.omf -share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf -share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf -share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf share/gnome/omf/gnome-applets/mixer_applet2-C.omf share/gnome/omf/gnome-applets/mixer_applet2-de.omf share/gnome/omf/gnome-applets/mixer_applet2-es.omf @@ -1265,8 +807,6 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/modemlights-C.omf -share/gnome/omf/gnome-applets/modemlights-eu.omf share/gnome/omf/gnome-applets/multiload-C.omf share/gnome/omf/gnome-applets/multiload-de.omf share/gnome/omf/gnome-applets/multiload-es.omf @@ -1291,18 +831,7 @@ share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/wireless-C.omf -share/gnome/omf/gnome-applets/wireless-de.omf -share/gnome/omf/gnome-applets/wireless-es.omf -share/gnome/omf/gnome-applets/wireless-eu.omf -share/gnome/omf/gnome-applets/wireless-fr.omf -share/gnome/omf/gnome-applets/wireless-it.omf -share/gnome/omf/gnome-applets/wireless-ja.omf -share/gnome/omf/gnome-applets/wireless-ko.omf -share/gnome/omf/gnome-applets/wireless-sv.omf -share/gnome/omf/gnome-applets/wireless-zh_CN.omf -share/gnome/omf/gnome-applets/wireless-zh_HK.omf -share/gnome/omf/gnome-applets/wireless-zh_TW.omf +share/gnome/omf/gnome-applets/trashapplet-C.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1339,104 +868,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png -%%BATTERY%%share/gnome/pixmaps/battstat.png -share/gnome/pixmaps/charpick.png -share/gnome/pixmaps/drivemount-applet.png -share/gnome/pixmaps/gkb-icon.png -share/gnome/pixmaps/gkb.png -share/gnome/pixmaps/gkb/ae.png -share/gnome/pixmaps/gkb/am.png -share/gnome/pixmaps/gkb/ar.png -share/gnome/pixmaps/gkb/at.png -share/gnome/pixmaps/gkb/az.png -share/gnome/pixmaps/gkb/be.png -share/gnome/pixmaps/gkb/bg.png -share/gnome/pixmaps/gkb/bh.png -share/gnome/pixmaps/gkb/br.png -share/gnome/pixmaps/gkb/by.png -share/gnome/pixmaps/gkb/ca.png -share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cu.png -share/gnome/pixmaps/gkb/cz.png -share/gnome/pixmaps/gkb/de.png -share/gnome/pixmaps/gkb/dj.png -share/gnome/pixmaps/gkb/dk.png -share/gnome/pixmaps/gkb/dz.png -share/gnome/pixmaps/gkb/ee.png -share/gnome/pixmaps/gkb/eg.png -share/gnome/pixmaps/gkb/es.png -share/gnome/pixmaps/gkb/eu.png -share/gnome/pixmaps/gkb/fi.png -share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/ge.png -share/gnome/pixmaps/gkb/gkb.png -share/gnome/pixmaps/gkb/gr.png -share/gnome/pixmaps/gkb/hr.png -share/gnome/pixmaps/gkb/hu.png -share/gnome/pixmaps/gkb/il.png -share/gnome/pixmaps/gkb/iq.png -share/gnome/pixmaps/gkb/is.png -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/la.png -share/gnome/pixmaps/gkb/lam.png -share/gnome/pixmaps/gkb/lb.png -share/gnome/pixmaps/gkb/lt.png -share/gnome/pixmaps/gkb/ly.png -share/gnome/pixmaps/gkb/ma.png -share/gnome/pixmaps/gkb/mk.png -share/gnome/pixmaps/gkb/mn.png -share/gnome/pixmaps/gkb/mx.png -share/gnome/pixmaps/gkb/nl.png -share/gnome/pixmaps/gkb/no.png -share/gnome/pixmaps/gkb/om.png -share/gnome/pixmaps/gkb/pl.png -share/gnome/pixmaps/gkb/ps.png -share/gnome/pixmaps/gkb/pt.png -share/gnome/pixmaps/gkb/qa.png -share/gnome/pixmaps/gkb/qc.png -share/gnome/pixmaps/gkb/ro.png -share/gnome/pixmaps/gkb/ru.png -share/gnome/pixmaps/gkb/sa.png -share/gnome/pixmaps/gkb/sd.png -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/sy.png -share/gnome/pixmaps/gkb/th.png -share/gnome/pixmaps/gkb/tn.png -share/gnome/pixmaps/gkb/tr.png -share/gnome/pixmaps/gkb/ua.png -share/gnome/pixmaps/gkb/uk.png -share/gnome/pixmaps/gkb/un.png -share/gnome/pixmaps/gkb/us.png -share/gnome/pixmaps/gkb/uy.png -share/gnome/pixmaps/gkb/vn.png -share/gnome/pixmaps/gkb/ye.png -share/gnome/pixmaps/gkb/yu.png -share/gnome/pixmaps/gnome-cpu.png -share/gnome/pixmaps/gnome-eyes.png -share/gnome/pixmaps/gnome-mini-commander.png -share/gnome/pixmaps/gnome-mixer-applet.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -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/mini-commander/browser-mini.xpm -share/gnome/pixmaps/mini-commander/history-mini.xpm -share/gnome/pixmaps/mixer/volume-max.png -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 +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png share/gnome/pixmaps/stickynotes/close.png share/gnome/pixmaps/stickynotes/locked.png share/gnome/pixmaps/stickynotes/resize_se.png @@ -1444,15 +881,7 @@ share/gnome/pixmaps/stickynotes/resize_sw.png share/gnome/pixmaps/stickynotes/stickynotes.png share/gnome/pixmaps/stickynotes/stickynotes_prelight.png share/gnome/pixmaps/stickynotes/unlocked.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/stickynotes/stickynotes.glade -share/gnome/wireless-applet/wireless-applet.glade +share/gnome/xmodmap/base.xml share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar share/gnome/xmodmap/xmodmap.be @@ -1538,6 +967,13 @@ share/gnome/xmodmap/xmodmap.us.old share/gnome/xmodmap/xmodmap.us101A_x86 share/gnome/xmodmap/xmodmap.us_intl share/gnome/xmodmap/xmodmap.yu +share/icons/hicolor/48x48/apps/ax-applet.png +share/icons/hicolor/48x48/apps/charpick.png +share/icons/hicolor/48x48/apps/gnome-cpu.png +share/icons/hicolor/48x48/apps/gnome-eyes.png +share/icons/hicolor/48x48/apps/gnome-mini-commander.png +share/icons/hicolor/48x48/apps/gnome-modem.png +share/icons/hicolor/48x48/apps/gnome-money.png share/icons/hicolor/48x48/apps/gswitchit-applet.png share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo @@ -1603,39 +1039,13 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo 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/wireless-applet -@dirrm share/gnome/stickynotes -@dirrm share/gnome/pixmaps/wireless-applet @dirrm share/gnome/pixmaps/stickynotes -@dirrm share/gnome/pixmaps/mixer -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/gkb +%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet @dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/wireless/zh_TW/figures -@dirrm share/gnome/help/wireless/zh_TW -@dirrm share/gnome/help/wireless/zh_HK/figures -@dirrm share/gnome/help/wireless/zh_HK -@dirrm share/gnome/help/wireless/zh_CN/figures -@dirrm share/gnome/help/wireless/zh_CN -@dirrm share/gnome/help/wireless/sv/figures -@dirrm share/gnome/help/wireless/sv -@dirrm share/gnome/help/wireless/ko/figures -@dirrm share/gnome/help/wireless/ko -@dirrm share/gnome/help/wireless/ja/figures -@dirrm share/gnome/help/wireless/ja -@dirrm share/gnome/help/wireless/it/figures -@dirrm share/gnome/help/wireless/it -@dirrm share/gnome/help/wireless/fr/figures -@dirrm share/gnome/help/wireless/fr -@dirrm share/gnome/help/wireless/eu -@dirrm share/gnome/help/wireless/es/figures -@dirrm share/gnome/help/wireless/es -@dirrm share/gnome/help/wireless/de/figures -@dirrm share/gnome/help/wireless/de -@dirrm share/gnome/help/wireless/C -@dirrm share/gnome/help/wireless +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/help/trashapplet @dirrm share/gnome/help/stickynotes_applet/zh_TW/figures @dirrm share/gnome/help/stickynotes_applet/zh_TW @dirrm share/gnome/help/stickynotes_applet/zh_HK/figures @@ -1658,6 +1068,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/stickynotes_applet/es @dirrm share/gnome/help/stickynotes_applet/de/figures @dirrm share/gnome/help/stickynotes_applet/de +@dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet @dirrm share/gnome/help/multiload/zh_TW/figures @@ -1685,11 +1096,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/modemlights/eu/figures -@dirrm share/gnome/help/modemlights/eu -@dirrm share/gnome/help/modemlights/C/figures -@dirrm share/gnome/help/modemlights/C -@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_HK/figures @@ -1715,31 +1121,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_HK/figures -@dirrm share/gnome/help/mailcheck/zh_HK -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/eu/figures -@dirrm share/gnome/help/mailcheck/eu -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_HK/figures @@ -1792,31 +1173,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2 @dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/gkb/zh_TW/figures -@dirrm share/gnome/help/gkb/zh_TW -@dirrm share/gnome/help/gkb/zh_HK/figures -@dirrm share/gnome/help/gkb/zh_HK -@dirrm share/gnome/help/gkb/zh_CN/figures -@dirrm share/gnome/help/gkb/zh_CN -@dirrm share/gnome/help/gkb/sv/figures -@dirrm share/gnome/help/gkb/sv -@dirrm share/gnome/help/gkb/ko/figures -@dirrm share/gnome/help/gkb/ko -@dirrm share/gnome/help/gkb/ja/figures -@dirrm share/gnome/help/gkb/ja -@dirrm share/gnome/help/gkb/it/figures -@dirrm share/gnome/help/gkb/it -@dirrm share/gnome/help/gkb/fr/figures -@dirrm share/gnome/help/gkb/fr -@dirrm share/gnome/help/gkb/eu/figures -@dirrm share/gnome/help/gkb/eu -@dirrm share/gnome/help/gkb/es/figures -@dirrm share/gnome/help/gkb/es -@dirrm share/gnome/help/gkb/de/figures -@dirrm share/gnome/help/gkb/de -@dirrm share/gnome/help/gkb/C/figures -@dirrm share/gnome/help/gkb/C -@dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/zh_TW/figures @dirrm share/gnome/help/geyes/zh_TW @dirrm share/gnome/help/geyes/zh_HK/figures @@ -1867,6 +1223,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet @dirrm share/gnome/help/command-line/zh_TW/figures @dirrm share/gnome/help/command-line/zh_TW @dirrm share/gnome/help/command-line/zh_HK/figures @@ -1917,31 +1276,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -@dirrm share/gnome/help/cdplayer/zh_TW/figures -@dirrm share/gnome/help/cdplayer/zh_TW -@dirrm share/gnome/help/cdplayer/zh_HK/figures -@dirrm share/gnome/help/cdplayer/zh_HK -@dirrm share/gnome/help/cdplayer/zh_CN/figures -@dirrm share/gnome/help/cdplayer/zh_CN -@dirrm share/gnome/help/cdplayer/sv/figures -@dirrm share/gnome/help/cdplayer/sv -@dirrm share/gnome/help/cdplayer/ko/figures -@dirrm share/gnome/help/cdplayer/ko -@dirrm share/gnome/help/cdplayer/ja/figures -@dirrm share/gnome/help/cdplayer/ja -@dirrm share/gnome/help/cdplayer/it/figures -@dirrm share/gnome/help/cdplayer/it -@dirrm share/gnome/help/cdplayer/fr/figures -@dirrm share/gnome/help/cdplayer/fr -@dirrm share/gnome/help/cdplayer/eu/figures -@dirrm share/gnome/help/cdplayer/eu -@dirrm share/gnome/help/cdplayer/es/figures -@dirrm share/gnome/help/cdplayer/es -@dirrm share/gnome/help/cdplayer/de/figures -@dirrm share/gnome/help/cdplayer/de -@dirrm share/gnome/help/cdplayer/C/figures -@dirrm share/gnome/help/cdplayer/C -@dirrm share/gnome/help/cdplayer %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW %%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures @@ -1972,16 +1306,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/C/figures @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status -@dirrm share/gnome/gweather -@dirrm share/gnome/gswitchit -@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 share/gnome/gnome-applets/gweather +@dirrm share/gnome/gnome-applets/glade +@dirrm share/gnome/gnome-applets/geyes/Horrid +@dirrm share/gnome/gnome-applets/geyes/Default +@dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Bloodshot +@dirrm share/gnome/gnome-applets/geyes/Bizarre +@dirrm share/gnome/gnome-applets/geyes +@dirrm share/gnome/gnome-applets @dirrm libexec/gnome-applets @dirrm include/libgswitchit diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index dd0d8e759343..e9e4262d4141 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.8 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 5cddabf936c5..91296a8ac2b4 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.8.3.tar.bz2) = 607f8689f931336ad9a1f3f41d98a9c7 -SIZE (gnome2/gnome-desktop-2.8.3.tar.bz2) = 1142079 +MD5 (gnome2/gnome-desktop-2.10.0.tar.bz2) = 62edee01c309cb1b049ceaa801d415cc +SIZE (gnome2/gnome-desktop-2.10.0.tar.bz2) = 1102509 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index d1cb33594f24..77b705c7d400 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -4,8 +4,9 @@ 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.3 +lib/libgnome-desktop-2.so.4 libdata/pkgconfig/gnome-desktop-2.0.pc +share/gnome/applications/gnome-about.desktop share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png @@ -33,12 +34,10 @@ share/gnome/omf/gnome-desktop/gpl-C.omf share/gnome/omf/gnome-desktop/gpl-eu.omf share/gnome/omf/gnome-desktop/lgpl-C.omf share/gnome/omf/gnome-desktop/lgpl-eu.omf -share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png -share/gnome/pixmaps/gnome-applications.png share/gnome/pixmaps/gnome-background-image.png share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png @@ -61,7 +60,6 @@ share/gnome/pixmaps/gnome-debian.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png -share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png @@ -80,19 +78,13 @@ share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png share/gnome/pixmaps/gnome-logo-large.png -share/gnome/pixmaps/gnome-mailcheck.png share/gnome/pixmaps/gnome-mdi.png share/gnome/pixmaps/gnome-mnemonic.png -share/gnome/pixmaps/gnome-modem.png -share/gnome/pixmaps/gnome-money.png -share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png @@ -106,7 +98,6 @@ share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png share/gnome/pixmaps/gnome-user-interface.png -share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png share/gnome/pixmaps/gnome-windows.png share/gnome/pixmaps/gnome-word.png @@ -114,21 +105,8 @@ share/gnome/pixmaps/gnome-workspace.png share/gnome/pixmaps/gnome-xterm.png share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm -share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png share/gnome/pixmaps/vnterm.xpm -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Other.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo @@ -200,17 +178,14 @@ 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 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/gnome/omf/gnome-desktop @dirrm share/gnome/help/lgpl/eu @dirrm share/gnome/help/gpl/eu diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile new file mode 100644 index 000000000000..244555afbf3e --- /dev/null +++ b/x11/gnome-menus/Makefile @@ -0,0 +1,39 @@ +# New ports collection makefile for: gnome-menus +# Date created: 30 November 2004 +# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> +# +# $FreeBSD$ +# + +PORTNAME= gnome-menus +PORTVERSION= 2.10.0 +CATEGORIES= x11 gnome +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +DIST_SUBDIR= gnome2 + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Implementation of the FreeDesktop Desktop Menu Spec + +USE_BZIP2= yes +USE_X_PREFIX= yes +USE_REINPLACE= yes +USE_GMAKE= yes +USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 +USE_LIBTOOL_VER=15 +INSTALLS_SHLIB= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \ + ${WRKSRC}/layout/applications.menu \ + ${WRKSRC}/layout/settings.menu + @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ + < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory + +post-install: + @${MKDIR} ${PREFIX}/share/gnome/desktop-directories + @${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories + +.include <bsd.port.mk> diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo new file mode 100644 index 000000000000..cf1ecb322ffe --- /dev/null +++ b/x11/gnome-menus/distinfo @@ -0,0 +1,2 @@ +MD5 (gnome2/gnome-menus-2.10.0.tar.bz2) = 7c0776f79dcd08de97de2b6f9c17c830 +SIZE (gnome2/gnome-menus-2.10.0.tar.bz2) = 337595 diff --git a/devel/gnome-vfs/files/KDE.directory b/x11/gnome-menus/files/KDE.directory index 032126bb99db..032126bb99db 100644 --- a/devel/gnome-vfs/files/KDE.directory +++ b/x11/gnome-menus/files/KDE.directory diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu new file mode 100644 index 000000000000..6f8b1fb5ae81 --- /dev/null +++ b/x11/gnome-menus/files/patch-layout::applications.menu @@ -0,0 +1,349 @@ +--- layout/applications.menu.orig Fri Jan 14 14:17:53 2005 ++++ layout/applications.menu Tue Mar 1 01:28:57 2005 +@@ -15,15 +15,18 @@ + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + +- <!-- Read in overrides and child menus from applications-merged/ --> +- <DefaultMergeDirs/> +- + <!-- Accessories submenu --> + <Menu> + <Name>Accessories</Name> + <Directory>Accessories.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Utility</Category> + <Not> + <Category>System</Category> +@@ -38,6 +41,12 @@ + <Directory>Accessibility.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Accessibility</Category> + <Not> + <Category>Settings</Category> +@@ -52,6 +61,12 @@ + <Directory>Development.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Development</Category> + </And> + <Filename>emacs.desktop</Filename> +@@ -64,6 +79,12 @@ + <Directory>Edutainment.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Education</Category> + </And> + </Include> +@@ -75,6 +96,12 @@ + <Directory>Games.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Game</Category> + </And> + </Include> +@@ -86,6 +113,12 @@ + <Directory>Graphics.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Graphics</Category> + </And> + </Include> +@@ -97,6 +130,12 @@ + <Directory>Internet.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Network</Category> + </And> + </Include> +@@ -108,6 +147,12 @@ + <Directory>Multimedia.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>AudioVideo</Category> + </And> + </Include> +@@ -119,6 +164,12 @@ + <Directory>Office.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Office</Category> + </And> + </Include> +@@ -130,6 +181,12 @@ + <Directory>System-Tools.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>System</Category> + <Not><Category>Settings</Category></Not> + </And> +@@ -143,11 +200,207 @@ + <OnlyUnallocated/> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Application</Category> + <Not><Category>Core</Category></Not> + <Not><Category>Settings</Category></Not> + </And> + </Include> + </Menu> <!-- End Other --> ++ ++ <!-- Read in overrides and child menus from applications-merged/ --> ++ <DefaultMergeDirs/> ++ ++ <!-- KDE --> ++ <Menu> ++ <Name>KDE</Name> ++ <Directory>KDE.directory</Directory> ++ ++ <!-- KAccessories submenu --> ++ <Menu> ++ <Name>Accessories</Name> ++ <Directory>Accessories.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Utility</Category> ++ <Not> ++ <Category>System</Category> ++ </Not> ++ </And> ++ </Include> ++ </Menu> <!-- End KAccessories --> ++ ++ <!-- KAccessibility submenu --> ++ <Menu> ++ <Name>Accessibility</Name> ++ <Directory>Accessibility.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Accessibility</Category> ++ <Not> ++ <Category>Settings</Category> ++ </Not> ++ </And> ++ </Include> ++ </Menu> <!-- End KAccessibility --> ++ ++ <!-- KDevelopment Tools --> ++ <Menu> ++ <Name>Development</Name> ++ <Directory>Development.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Development</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KDevelopment Tools --> ++ ++ <!-- KEdutainment --> ++ <Menu> ++ <Name>Edutainment</Name> ++ <Directory>Edutainment.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Education</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KEdutainment --> ++ ++ <!-- KGames --> ++ <Menu> ++ <Name>Games</Name> ++ <Directory>Games.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Game</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KGames --> ++ ++ <!-- KGraphics --> ++ <Menu> ++ <Name>Graphics</Name> ++ <Directory>Graphics.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Graphics</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KGraphics --> ++ ++ <!-- KInternet --> ++ <Menu> ++ <Name>Internet</Name> ++ <Directory>Internet.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Network</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KInternet --> ++ ++ <!-- KMultimedia --> ++ <Menu> ++ <Name>Multimedia</Name> ++ <Directory>Multimedia.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>AudioVideo</Category> ++ </And> ++ </Include> ++ </Menu> <!-- End KMultimedia --> ++ ++ <!-- KOffice --> ++ <Menu> ++ <Name>Office</Name> ++ <Directory>Office.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Or> ++ <Category>Office</Category> ++ <Category>Spreadsheet</Category> ++ <Category>WordProcessor</Category> ++ <Category>Calendar</Category> ++ <Category>ProjectManagement</Category> ++ </Or> ++ </And> ++ </Include> ++ </Menu><!-- End KOffice --> ++ ++ <!-- KSystem Tools--> ++ <Menu> ++ <Name>System</Name> ++ <Directory>System-Tools.directory</Directory> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>System</Category> ++ <Not><Category>Settings</Category></Not> ++ </And> ++ </Include> ++ </Menu> <!-- End KSystem Tools --> ++ ++ <!-- KOther --> ++ <Menu> ++ <Name>Other</Name> ++ <Directory>Other.directory</Directory> ++ <OnlyUnallocated/> ++ <Include> ++ <And> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ <Category>Application</Category> ++ <Not><Category>Core</Category></Not> ++ <Not><Category>Settings</Category></Not> ++ </And> ++ </Include> ++ </Menu> <!-- End KOther --> ++ </Menu> <!-- KDE --> + + </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu new file mode 100644 index 000000000000..fef1dc0dca96 --- /dev/null +++ b/x11/gnome-menus/files/patch-layout::preferences.menu @@ -0,0 +1,41 @@ +--- layout/preferences.menu.orig Sat Dec 11 07:58:50 2004 ++++ layout/preferences.menu Tue Mar 1 01:28:57 2005 +@@ -9,12 +9,15 @@ + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + +- <!-- Read in overrides and child menus from preferences-merged/ --> +- <DefaultMergeDirs/> +- + <!-- Stuff in the toplevel --> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Settings</Category> + <Not> + <Or> +@@ -36,10 +39,19 @@ + <Directory>Settings-Accessibility.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Settings</Category> + <Category>Accessibility</Category> + </And> + </Include> + </Menu> ++ ++ <!-- Read in overrides and child menus from preferences-merged/ --> ++ <DefaultMergeDirs/> + + </Menu> <!-- End Prefs --> diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu new file mode 100644 index 000000000000..266678df204c --- /dev/null +++ b/x11/gnome-menus/files/patch-layout::settings.menu @@ -0,0 +1,32 @@ +--- layout/settings.menu.orig Wed Jan 5 20:12:16 2005 ++++ layout/settings.menu Tue Mar 1 01:28:57 2005 +@@ -15,9 +15,6 @@ + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + +- <!-- Read in overrides and child menus from applications-merged/ --> +- <DefaultMergeDirs/> +- + <!-- Merge in these other files as submenus --> + <Menu> + <Name>Preferences</Name> +@@ -30,10 +27,19 @@ + <Directory>System-Settings.directory</Directory> + <Include> + <And> ++ <Not> ++ <Or> ++ <Category>Qt</Category> ++ <Category>KDE</Category> ++ </Or> ++ </Not> + <Category>Settings</Category> + <Category>System</Category> + </And> + </Include> + </Menu> <!-- End System Settings --> ++ ++ <!-- Read in overrides and child menus from settings-merged/ --> ++ <DefaultMergeDirs/> + + </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c new file mode 100644 index 000000000000..9bc620214ff6 --- /dev/null +++ b/x11/gnome-menus/files/patch-libmenu::menu-tree.c @@ -0,0 +1,173 @@ +--- libmenu/menu-tree.c.orig Tue Mar 1 01:24:07 2005 ++++ libmenu/menu-tree.c Tue Mar 1 01:24:17 2005 +@@ -67,6 +67,12 @@ + gpointer user_data; + } MenuTreeMonitor; + ++typedef struct ++{ ++ MenuTreeDirectory *directory; ++ GSList *list; ++} MenuTreeListifyForeachData; ++ + struct MenuTreeDirectory + { + MenuTreeDirectory *parent; +@@ -75,6 +81,7 @@ + char *name; + + GSList *entries; ++ GSList *excluded_entries; + GSList *subdirs; + + guint refcount : 24; +@@ -702,17 +709,15 @@ + } + } + +-GSList * +-menu_tree_directory_get_entries (MenuTreeDirectory *directory) ++static GSList * ++copy_and_ref_entry_list (GSList *list) + { + GSList *retval; + GSList *tmp; + +- g_return_val_if_fail (directory != NULL, NULL); +- + retval = NULL; + +- tmp = directory->entries; ++ tmp = list; + while (tmp != NULL) + { + retval = g_slist_prepend (retval, +@@ -725,6 +730,22 @@ + } + + GSList * ++menu_tree_directory_get_entries (MenuTreeDirectory *directory) ++{ ++ g_return_val_if_fail (directory != NULL, NULL); ++ ++ return copy_and_ref_entry_list (directory->entries); ++} ++ ++GSList * ++menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory) ++{ ++ g_return_val_if_fail (directory != NULL, NULL); ++ ++ return copy_and_ref_entry_list (directory->excluded_entries); ++} ++ ++GSList * + menu_tree_directory_get_subdirs (MenuTreeDirectory *directory) + { + GSList *retval; +@@ -891,6 +912,7 @@ + retval->name = g_strdup (name); + retval->directory_entry = NULL; + retval->entries = NULL; ++ retval->excluded_entries = NULL; + retval->subdirs = NULL; + retval->only_unallocated = FALSE; + retval->refcount = 1; +@@ -2267,16 +2289,21 @@ + } + + static void +-entries_listify_foreach (const char *desktop_file_id, +- DesktopEntry *desktop_entry, +- MenuTreeDirectory *directory) ++entries_listify_foreach (const char *desktop_file_id, ++ DesktopEntry *desktop_entry, ++ MenuTreeListifyForeachData *foreach_data) + { + MenuTreeEntry *entry; + +- entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id); ++ g_return_if_fail (foreach_data); ++ g_return_if_fail (foreach_data->directory); ++ ++ entry = menu_tree_entry_new (foreach_data->directory, ++ desktop_entry, ++ desktop_file_id); + +- directory->entries = g_slist_prepend (directory->entries, +- entry); ++ foreach_data->list = g_slist_prepend (foreach_data->list, ++ entry); + } + + static MenuTreeDirectory * +@@ -2290,11 +2317,14 @@ + MenuLayoutNode *layout_iter; + MenuTreeDirectory *directory; + DesktopEntrySet *entries; ++ DesktopEntrySet *excluded_entries; + DesktopEntrySet *allocated_set; + gboolean deleted; + gboolean only_unallocated; + GSList *tmp; + ++ MenuTreeListifyForeachData foreach_data; ++ + g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU); + g_assert (menu_layout_node_menu_get_name (layout) != NULL); + +@@ -2311,6 +2341,7 @@ + dir_dirs = menu_layout_node_menu_get_directory_dirs (layout); + + entries = desktop_entry_set_new (); ++ excluded_entries = desktop_entry_set_new (); + allocated_set = desktop_entry_set_new (); + + layout_iter = menu_layout_node_get_children (layout); +@@ -2357,6 +2388,7 @@ + if (rule_set != NULL) + { + desktop_entry_set_union (entries, rule_set); ++ desktop_entry_set_subtract (excluded_entries, rule_set); + desktop_entry_set_union (allocated_set, rule_set); + desktop_entry_set_unref (rule_set); + } +@@ -2389,6 +2421,7 @@ + if (rule_set != NULL) + { + desktop_entry_set_subtract (entries, rule_set); ++ desktop_entry_set_union (excluded_entries, rule_set); + desktop_entry_set_unref (rule_set); + } + +@@ -2488,15 +2521,28 @@ + if (deleted) + { + desktop_entry_set_unref (entries); ++ desktop_entry_set_unref (excluded_entries); + menu_tree_directory_unref (directory); + return NULL; + } + +- directory->entries = NULL; ++ foreach_data.directory = directory; ++ foreach_data.list = NULL; + desktop_entry_set_foreach (entries, + (DesktopEntrySetForeachFunc) entries_listify_foreach, +- directory); ++ &foreach_data); + desktop_entry_set_unref (entries); ++ ++ directory->entries = foreach_data.list; ++ ++ foreach_data.directory = directory; ++ foreach_data.list = NULL; ++ desktop_entry_set_foreach (excluded_entries, ++ (DesktopEntrySetForeachFunc) entries_listify_foreach, ++ &foreach_data); ++ desktop_entry_set_unref (excluded_entries); ++ ++ directory->excluded_entries = foreach_data.list; + + tmp = directory->entries; + while (tmp != NULL) diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.h b/x11/gnome-menus/files/patch-libmenu::menu-tree.h new file mode 100644 index 000000000000..e5f5ae76691d --- /dev/null +++ b/x11/gnome-menus/files/patch-libmenu::menu-tree.h @@ -0,0 +1,14 @@ +--- libmenu/menu-tree.h.orig Wed Jan 12 15:23:52 2005 ++++ libmenu/menu-tree.h Tue Mar 1 01:24:17 2005 +@@ -44,8 +44,9 @@ + MenuTreeDirectory *menu_tree_get_directory_from_path (MenuTree *tree, + const char *path); + +-GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); +-GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); ++GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); ++GSList *menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory); ++GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); + + MenuTreeDirectory *menu_tree_directory_ref (MenuTreeDirectory *directory); + void menu_tree_directory_unref (MenuTreeDirectory *directory); diff --git a/x11/gnome-menus/pkg-descr b/x11/gnome-menus/pkg-descr new file mode 100644 index 000000000000..3f2b7c336c7f --- /dev/null +++ b/x11/gnome-menus/pkg-descr @@ -0,0 +1,12 @@ +This package is free software and is part of the +GNOME project. + +The package contains an implementation of the draft "Desktop +Menu Specification" from freedesktop.org: + + http://www.freedesktop.org/Standards/menu-spec + +Also contained here are the GNOME menu layout configuration +files, .directory files and assorted menu related utility programs. + +-- gnome-menus README diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist new file mode 100644 index 000000000000..21d744dfa658 --- /dev/null +++ b/x11/gnome-menus/pkg-plist @@ -0,0 +1,77 @@ +bin/gnome-menu-spec-test +etc/xdg/menus/applications.menu +etc/xdg/menus/preferences.menu +etc/xdg/menus/settings.menu +include/gnome-menus/menu-tree.h +lib/libgnome-menu.a +lib/libgnome-menu.so +lib/libgnome-menu.so.0 +libdata/pkgconfig/libgnome-menu.pc +share/gnome/desktop-directories/Accessibility.directory +share/gnome/desktop-directories/Accessories.directory +share/gnome/desktop-directories/Applications.directory +share/gnome/desktop-directories/Development.directory +share/gnome/desktop-directories/Edutainment.directory +share/gnome/desktop-directories/Games.directory +share/gnome/desktop-directories/Graphics.directory +share/gnome/desktop-directories/Internet.directory +share/gnome/desktop-directories/KDE.directory +share/gnome/desktop-directories/Multimedia.directory +share/gnome/desktop-directories/Office.directory +share/gnome/desktop-directories/Other.directory +share/gnome/desktop-directories/Settings-Accessibility.directory +share/gnome/desktop-directories/Settings.directory +share/gnome/desktop-directories/System-Settings.directory +share/gnome/desktop-directories/System-Tools.directory +share/locale/ar/LC_MESSAGES/gnome-menus.mo +share/locale/bg/LC_MESSAGES/gnome-menus.mo +share/locale/ca/LC_MESSAGES/gnome-menus.mo +share/locale/cs/LC_MESSAGES/gnome-menus.mo +share/locale/cy/LC_MESSAGES/gnome-menus.mo +share/locale/da/LC_MESSAGES/gnome-menus.mo +share/locale/de/LC_MESSAGES/gnome-menus.mo +share/locale/el/LC_MESSAGES/gnome-menus.mo +share/locale/en_GB/LC_MESSAGES/gnome-menus.mo +share/locale/en_CA/LC_MESSAGES/gnome-menus.mo +share/locale/es/LC_MESSAGES/gnome-menus.mo +share/locale/et/LC_MESSAGES/gnome-menus.mo +share/locale/eu/LC_MESSAGES/gnome-menus.mo +share/locale/fa/LC_MESSAGES/gnome-menus.mo +share/locale/fi/LC_MESSAGES/gnome-menus.mo +share/locale/fr/LC_MESSAGES/gnome-menus.mo +share/locale/gu/LC_MESSAGES/gnome-menus.mo +share/locale/hi/LC_MESSAGES/gnome-menus.mo +share/locale/hu/LC_MESSAGES/gnome-menus.mo +share/locale/id/LC_MESSAGES/gnome-menus.mo +share/locale/it/LC_MESSAGES/gnome-menus.mo +share/locale/ja/LC_MESSAGES/gnome-menus.mo +share/locale/ko/LC_MESSAGES/gnome-menus.mo +share/locale/lt/LC_MESSAGES/gnome-menus.mo +share/locale/mk/LC_MESSAGES/gnome-menus.mo +share/locale/ms/LC_MESSAGES/gnome-menus.mo +share/locale/nb/LC_MESSAGES/gnome-menus.mo +share/locale/ne/LC_MESSAGES/gnome-menus.mo +share/locale/nl/LC_MESSAGES/gnome-menus.mo +share/locale/nn/LC_MESSAGES/gnome-menus.mo +share/locale/no/LC_MESSAGES/gnome-menus.mo +share/locale/pa/LC_MESSAGES/gnome-menus.mo +share/locale/pl/LC_MESSAGES/gnome-menus.mo +share/locale/pt/LC_MESSAGES/gnome-menus.mo +share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo +share/locale/ro/LC_MESSAGES/gnome-menus.mo +share/locale/ru/LC_MESSAGES/gnome-menus.mo +share/locale/sk/LC_MESSAGES/gnome-menus.mo +share/locale/sq/LC_MESSAGES/gnome-menus.mo +share/locale/sr/LC_MESSAGES/gnome-menus.mo +share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo +share/locale/sv/LC_MESSAGES/gnome-menus.mo +share/locale/th/LC_MESSAGES/gnome-menus.mo +share/locale/tr/LC_MESSAGES/gnome-menus.mo +share/locale/uk/LC_MESSAGES/gnome-menus.mo +share/locale/vi/LC_MESSAGES/gnome-menus.mo +share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo +share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo +@dirrm share/gnome/desktop-directories +@dirrm include/gnome-menus +@dirrm etc/xdg/menus +@dirrm etc/xdg diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index d28b9bf69171..effa2a92467c 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.8 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,8 +22,8 @@ INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop \ - libwnck +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + libwnck gnomemenus WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes @@ -33,7 +34,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-panel.1 -GCONF_SCHEMAS= clock.schemas fish.schemas gnome-panel-screenshot.schemas \ +GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-compatibility.schemas panel-general.schemas \ panel-global.schemas panel-object.schemas \ panel-toplevel.schemas window-list.schemas \ @@ -53,9 +54,9 @@ CONFIGURE_ARGS+=--enable-eds CONFIGURE_ARGS+=--disable-eds .endif +post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) -post-patch: .for po in da.po it.po zh_CN.po zh_TW.po @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index de09d47ea354..14d5d7ced6f6 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.8.3.tar.bz2) = d76a09c321e02c18e0fdecb86677550d -SIZE (gnome2/gnome-panel-2.8.3.tar.bz2) = 3103815 +MD5 (gnome2/gnome-panel-2.10.0.tar.bz2) = 398e95097aeb7b8be2b6b47a0f9affe0 +SIZE (gnome2/gnome-panel-2.10.0.tar.bz2) = 3085157 diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index 1c8d80f4a383..6f6a65805ea4 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -1,19 +1,18 @@ bin/gnome-desktop-item-edit bin/gnome-panel -bin/gnome-panel-screenshot bin/panel-test-applets -@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true +@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true -@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true +@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-enums.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.0 +lib/libpanel-applet-2.so.1 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -50,10 +49,6 @@ share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml -share/gnome/gnome-panel/glade/fish.glade -share/gnome/gnome-panel/glade/panel-test-applets.glade -share/gnome/gnome-panel/glade/window-list.glade -share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -79,6 +74,9 @@ share/gnome/help/clock/ko/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml +share/gnome/help/clock/uk/clock.xml +share/gnome/help/clock/uk/figures/clock_applet.png +share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml @@ -115,6 +113,9 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml +share/gnome/help/fish-applet-2/uk/figures/fish_applet.png +share/gnome/help/fish-applet-2/uk/fish-applet-2.xml +share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -161,6 +162,10 @@ share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml +share/gnome/help/window-list/uk/figures/window_list_applet.png +share/gnome/help/window-list/uk/figures/window_list_group_applet.png +share/gnome/help/window-list/uk/legal.xml +share/gnome/help/window-list/uk/window-list.xml share/gnome/help/window-list/zh_CN/figures/window_list_applet.png share/gnome/help/window-list/zh_CN/figures/window_list_group.png share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png @@ -201,6 +206,9 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml +share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/uk/legal.xml +share/gnome/help/workspace-switcher/uk/workspace-switcher.xml share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_CN/legal.xml @@ -218,6 +226,7 @@ share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf +share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf share/gnome/omf/gnome-panel/fish-applet-2-C.omf @@ -228,6 +237,7 @@ share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf +share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf share/gnome/omf/gnome-panel/window-list-C.omf @@ -238,6 +248,7 @@ share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf +share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf share/gnome/omf/gnome-panel/workspace-switcher-C.omf @@ -248,33 +259,25 @@ share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf +share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf -share/gnome/panel/gnome-panel-screenshot.glade -share/gnome/panel/panel-properties-dialog.glade -share/gnome/panel/panel-run-dialog.glade -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/fish/fishanim.png -share/gnome/pixmaps/fish/footguy.png -share/gnome/pixmaps/fish/monkey.png -share/gnome/pixmaps/fish/oldwanda.png -share/gnome/pixmaps/gnome-amusements.png -share/gnome/pixmaps/gnome-clock.png -share/gnome/pixmaps/gnome-fish.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png -share/gnome/pixmaps/gnome-main-menu.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-force-quit.png +share/gnome/panel/glade/fish.glade +share/gnome/panel/glade/panel-properties-dialog.glade +share/gnome/panel/glade/panel-run-dialog.glade +share/gnome/panel/glade/panel-test-applets.glade +share/gnome/panel/glade/window-list.glade +share/gnome/panel/glade/workspace-switcher.glade +share/gnome/panel/pixmaps/fishanim.png +share/gnome/panel/pixmaps/footguy.png +share/gnome/panel/pixmaps/gnome-gegl2-2.png +share/gnome/panel/pixmaps/gnome-gegl2.png +share/gnome/panel/pixmaps/monkey.png +share/gnome/panel/pixmaps/oldwanda.png +share/icons/hicolor/48x48/apps/gnome-fish.png +share/icons/hicolor/48x48/apps/gnome-gegl.png +share/icons/hicolor/48x48/apps/gnome-main-menu.png +share/icons/hicolor/48x48/apps/panel-force-quit.png share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -319,6 +322,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo @@ -347,13 +351,28 @@ share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo -@dirrm share/gnome/pixmaps/fish +@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true +@dirrm share/gnome/panel/pixmaps +@dirrm share/gnome/panel/glade @dirrm share/gnome/omf/gnome-panel @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @dirrm share/gnome/help/workspace-switcher/zh_CN/figures @dirrm share/gnome/help/workspace-switcher/zh_CN +@dirrm share/gnome/help/workspace-switcher/uk/figures +@dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv @dirrm share/gnome/help/workspace-switcher/ko/figures @@ -375,6 +394,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/zh_TW @dirrm share/gnome/help/window-list/zh_CN/figures @dirrm share/gnome/help/window-list/zh_CN +@dirrm share/gnome/help/window-list/uk/figures +@dirrm share/gnome/help/window-list/uk @dirrm share/gnome/help/window-list/sv/figures @dirrm share/gnome/help/window-list/sv @dirrm share/gnome/help/window-list/ko/figures @@ -396,6 +417,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN +@dirrm share/gnome/help/fish-applet-2/uk/figures +@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @@ -417,6 +440,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN +@dirrm share/gnome/help/clock/uk/figures +@dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/ko/figures @@ -434,7 +459,5 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/C/figures @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock -@dirrm share/gnome/gnome-panel/glade -@dirrm share/gnome/gnome-panel @dirrm share/doc/panel-applet @dirrm include/panel-2.0 diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 37f82afac725..1f48df2e0f83 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -6,17 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ - http://people.FreeBSD.org/~marcus/:local \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.8 \ - marcus/:local + ${MASTER_SITE_LOCAL:S/$/:local/} \ + http://people.FreeBSD.org/~pav/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ + pav/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${SPLASH_IMG}:local + ${SPLASHES}:local DIST_SUBDIR= gnome2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -25,11 +24,9 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=15 -CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ - --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,13 +35,19 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASH_IMG= gnome-splash28.png +SPLASHES= freebsd-splashes-gnome-2.10.tar post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} + cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} post-install: - ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \ + ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ + ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png +.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ + ${PREFIX}/share/gnome/pixmaps/splash +.endfor .include <bsd.port.mk> diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 8f05e97ece4c..5f305e45c84f 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98 -SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921 -MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 -SIZE (gnome2/gnome-splash28.png) = 121715 +MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff +SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 +MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 +SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in index 2b05e8c0027e..ed0b6ac56866 100644 --- a/x11/gnome-session/files/patch-gnome-session_Makefile.in +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -1,11 +1,11 @@ ---- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004 -+++ gnome-session/Makefile.in Mon May 31 14:34:57 2004 -@@ -153,7 +153,7 @@ - +--- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004 ++++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004 +@@ -209,7 +209,7 @@ + target_alias = @target_alias@ NULL = -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" - + INCLUDES = \ + $(GNOME_SESSION_CFLAGS) \ diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c deleted file mode 100644 index f82aefdc7d2e..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_logout.c +++ /dev/null @@ -1,36 +0,0 @@ ---- gnome-session/logout.c.orig Sun May 9 15:45:34 2004 -+++ gnome-session/logout.c Sun May 9 15:48:29 2004 -@@ -37,12 +37,20 @@ - - static gchar *halt_command[] = - { -+#ifdef __FreeBSD__ -+ HALT_COMMAND, "-p", "now", NULL -+#else - HALT_COMMAND, NULL -+#endif - }; - - static gchar *reboot_command[] = - { -+#ifdef __FreeBSD__ -+ REBOOT_COMMAND, "-r", "now", NULL -+#else - REBOOT_COMMAND, NULL -+#endif - }; - - /* What action to take upon shutdown */ -@@ -401,8 +409,12 @@ - */ - s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL); - t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL); -+#ifndef __FreeBSD__ - if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) && - access (halt_command[0], X_OK) == 0) -+#else -+ if (access (halt_command[0], X_OK) == 0) -+#endif - { - GtkWidget *title, *spacer; - GtkWidget *action_vbox, *hbox; diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c deleted file mode 100644 index 7e56843ac733..000000000000 --- a/x11/gnome-session/files/patch-gnome-session_manager.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome-session/manager.c.orig Tue Oct 12 14:04:26 2004 -+++ gnome-session/manager.c Tue Oct 12 14:05:51 2004 -@@ -1042,9 +1042,10 @@ - - if (interact_ping_replied) - { -+ IceConn ice_conn; - gsm_verbose ("have interact_list; sending ping with data to client %p\n", client); - print_client (client); -- IceConn ice_conn = SmsGetIceConnection (client->connection); -+ ice_conn = SmsGetIceConnection (client->connection); - interact_ping_replied = FALSE; - IcePing (ice_conn, interact_ping_reply, (IcePointer)client); - } diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 6107618a5527..999c30043083 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -4,10 +4,17 @@ bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm -share/gnome/control-center-2.0/capplets/session-properties.desktop +share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm +share/gnome/pixmaps/splash/adamw.png +share/gnome/pixmaps/splash/banana_flex.png +share/gnome/pixmaps/splash/franco_malatacca.jpg +share/gnome/pixmaps/splash/franz_klammer-1.png +share/gnome/pixmaps/splash/franz_klammer-3.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/original-gnome-splash.png +share/gnome/pixmaps/splash/radek.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -57,6 +64,7 @@ share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo @@ -76,5 +84,7 @@ share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index f01b7bd6507b..61b4256f05e8 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.8 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,11 +17,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui vte +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index ca84bcc12c2b..bb6a1fa2132f 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.8.2.tar.bz2) = ffa668b7301dff6ce5ad9ec4c1e11c92 -SIZE (gnome2/gnome-terminal-2.8.2.tar.bz2) = 2171397 +MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 +SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c deleted file mode 100644 index aafbb3a44ce0..000000000000 --- a/x11/gnome-terminal/files/patch-src::terminal-screen.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/terminal-screen.c.orig Thu Nov 18 12:45:11 2004 -+++ src/terminal-screen.c Thu Nov 18 12:46:31 2004 -@@ -246,16 +246,16 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" - - terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); - - terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); - - terminal_widget_match_add (screen->priv->term, - -- "\\<(mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); - - terminal_screen_setup_dnd (screen); - diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index ca1a70673fac..22d4a5870a1e 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -48,6 +48,10 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/sv/figures/terminal_window.png share/gnome/help/gnome-terminal/sv/gnome-terminal.xml share/gnome/help/gnome-terminal/sv/legal.xml +share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/uk/gnome-terminal.xml +share/gnome/help/gnome-terminal/uk/legal.xml share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png @@ -67,6 +71,7 @@ share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf +share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf share/gnome/pixmaps/gnome-terminal.png @@ -109,6 +114,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nb/LC_MESSAGES/gnome-terminal.mo +share/locale/ne/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo @@ -137,6 +143,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @dirrm share/gnome/help/gnome-terminal/zh_CN +@dirrm share/gnome/help/gnome-terminal/uk/figures +@dirrm share/gnome/help/gnome-terminal/uk @dirrm share/gnome/help/gnome-terminal/sv/figures @dirrm share/gnome/help/gnome-terminal/sv @dirrm share/gnome/help/gnome-terminal/ro/figures diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 74107e376ac4..7b86e41a9a61 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -6,7 +6,8 @@ # PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -25,24 +26,29 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ tsclient:${PORTSDIR}/net/tsclient \ galeon:${PORTSDIR}/www/galeon \ seahorse:${PORTSDIR}/security/seahorse \ - ${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \ + ${X11BASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \ bluefish:${PORTSDIR}/www/bluefish \ gossip:${PORTSDIR}/net/gossip \ - inkscape:${PORTSDIR}/graphics/inkscape \ straw:${PORTSDIR}/net/straw \ liferea:${PORTSDIR}/net/liferea \ gnotime:${PORTSDIR}/deskutils/gnotime \ - sound-juicer:${PORTSDIR}/audio/sound-juicer \ rhythmbox:${PORTSDIR}/audio/rhythmbox \ jamboree:${PORTSDIR}/audio/jamboree \ - ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data + ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \ + nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \ + evince:${PORTSDIR}/graphics/evince \ + goobox:${PORTSDIR}/audio/goobox -.if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD) -RUN_DEPENDS+= totem:${PORTSDIR}/multimedia/totem +.include <bsd.port.pre.mk> + +#inkscape currently needs 5.X to build. this should hopefully +#change soon +.if ${OSVERSION} > 500000 +RUN_DEPENDS+= inkscape:${PORTSDIR}/graphics/inkscape .endif NO_BUILD= yes do-install: # empty -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 9f9fbefc76ae..4c8b3d422f4d 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= # empty PKGNAMESUFFIX= -lite @@ -16,11 +16,10 @@ EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases -RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ +RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog \ - gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ gedit:${PORTSDIR}/editors/gedit \ gnome-terminal:${PORTSDIR}/x11/gnometerminal \ gnome-session:${PORTSDIR}/x11/gnomesession \ @@ -35,9 +34,10 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ ggv:${PORTSDIR}/print/ggv \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ - gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ - gconf-editor:${PORTSDIR}/sysutils/gconf-editor + gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ + gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ + totem:${PORTSDIR}/multimedia/totem-gstreamer NO_BUILD= yes @@ -54,7 +54,7 @@ do-install: # empty .include <bsd.port.pre.mk> -.if ${ARCH} != "amd64" && ( ${ARCH} == "i386" || ${OSVERSION} > 500035 ) +.if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 38c95f237a05..f0b12cc46bfc 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome2-power-tools -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -15,7 +15,7 @@ EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= "Geektoys" for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.4/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ @@ -24,8 +24,10 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.4/extensions/libgesturesextension.so:${PO gdesklets:${PORTSDIR}/deskutils/gdesklets \ cog:${PORTSDIR}/sysutils/cog \ gnome-blog-poster:${PORTSDIR}/deskutils/gnomeblog \ - gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ - gnomesu:${PORTSDIR}/security/libgnomesu + gnomesu:${PORTSDIR}/security/libgnomesu \ + bpm:${PORTSDIR}/sysutils/bpm \ + gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ + gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 0ddd63d09fca..c6b6052f6d8a 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gnome2 -PORTVERSION= 2.8.3 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -16,11 +15,10 @@ EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop -RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ +RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog \ - gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ gnect:${PORTSDIR}/games/gnomegames2 \ gedit:${PORTSDIR}/editors/gedit \ @@ -44,17 +42,22 @@ RUN_DEPENDS= ${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ zenity:${PORTSDIR}/x11/zenity \ - gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.0:${PORTSDIR}/mail/evolution \ + evolution-2.2:${PORTSDIR}/mail/evolution \ ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ gnome-nettool:${PORTSDIR}/net/gnomenettool \ vino-session:${PORTSDIR}/net/vino \ - ximian-connector-setup-2.0:${PORTSDIR}/mail/ximian-connector + ximian-connector-setup-2.2:${PORTSDIR}/mail/ximian-connector \ + ${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ + totem:${PORTSDIR}/multimedia/totem-gstreamer \ + gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ + ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ + sound-juicer:${PORTSDIR}/audio/sound-juicer \ + ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml NO_BUILD= yes diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index ddc1e9ce7ad9..d2ee9028fc0f 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -6,27 +6,28 @@ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.8.2 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.8 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Applets components for the Gnome 2 Desktop Environment +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools LIB_DEPENDS= gtop-2.0:${PORTSDIR}/devel/libgtop2 \ - xklavier.8:${PORTSDIR}/x11/libxklavier + xklavier.10:${PORTSDIR}/x11/libxklavier \ + gucharmap.4:${PORTSDIR}/deskutils/gucharmap +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools USE_BZIP2= yes USE_X_PREFIX= yes -INSTALLS_OMF= yes USE_GMAKE= yes -USE_REINPLACE= yes GNOME_DESKTOP_VERSION=2 -USE_GNOME= gnomehier gnomeprefix gnomehack intlhack gnomepanel \ +INSTALLS_OMF= yes +USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ gail USE_GSTREAMER= yes USE_LIBTOOL_VER=15 @@ -34,10 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} -GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \ +GCONF_SCHEMAS= charpick.schemas drivemount.schemas geyes.schemas \ gswitchit.schemas gtik.schemas gweather.schemas \ - mailcheck.schemas mini-commander.schemas mixer.schemas \ - modemlights.schemas multiload.schemas stickynotes.schemas + mini-commander-global.schemas mini-commander.schemas \ + mixer.schemas multiload.schemas \ + stickynotes.schemas FREEBSD_SYS?= /usr/src/sys @@ -50,6 +52,7 @@ PLIST_SUB= BATTERY="@comment " GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" +.if ${OSVERSION} < 600019 pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " W A R N I N G" @@ -62,5 +65,13 @@ pre-everything:: @${ECHO_MSG} "*****************************************************" @${ECHO_MSG} "" .endif +.endif + +.if ${ARCH} != "i386" && ${ARCH} != "amd64" +PLIST_SUB+= CPUFREQ="@comment " +.else +PLIST_SUB+= CPUFREQ="" +GCONF_SCHEMAS+= cpufreq-applet.schemas +.endif .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index 5812235d13fa..7bfa1c4099db 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.8.2.tar.bz2) = 10d83b6e031bad31d7cfefe2c4884bd7 -SIZE (gnome2/gnome-applets-2.8.2.tar.bz2) = 6049108 +MD5 (gnome2/gnome-applets-2.10.0.tar.bz2) = c230df43a21a0d788197b5b0f3e688f1 +SIZE (gnome2/gnome-applets-2.10.0.tar.bz2) = 5662438 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index a0025a0ad050..2a74a1ed8f2b 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -1,23 +1,25 @@ ---- configure.orig Mon Dec 6 21:22:34 2004 -+++ configure Mon Dec 6 21:22:58 2004 +--- configure.orig Tue Mar 1 12:35:29 2005 ++++ configure Tue Mar 1 12:36:09 2005 @@ -463,7 +463,7 @@ # include <unistd.h> #endif" --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS' +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. -@@ -24351,6 +24351,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";; -+*freebsd*) CDROM_HOST=freebsd;cd_device_path="/dev/acd0c";; - *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;; - esac - case "$host" in -@@ -24412,6 +24413,7 @@ +@@ -23136,8 +23136,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${prefix}/share/locale"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${prefix}/share/locale"` + GNOMELOCALEDIR="$ac_define_dir" + + +@@ -24838,6 +24837,7 @@ HAVE_LIBAPM=no NEED_LIBAPM=no @@ -25,7 +27,7 @@ build_battstat_applet=no if test x$disable_battstat = xno; then -@@ -24563,7 +24565,12 @@ +@@ -24989,7 +24989,12 @@ ;; # list of supported OS cores that do not use libapm @@ -39,28 +41,100 @@ ;; *) echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -26794,14 +26801,14 @@ - ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +@@ -25795,6 +25800,9 @@ + *linux*) + build_cpufreq_applet=yes + ;; ++ i386-*-freebsd*|amd64-*-freebsd*) ++ build_cpufreq_applet=yes ++ ;; + *) + echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 + build_cpufreq_applet=no +@@ -26085,7 +26093,7 @@ + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - cat >>confdefs.h <<_ACEOF --#define GNOME_ICONDIR "${prefix}/share/pixmaps" -+#define GNOME_ICONDIR "${datadir}/pixmaps" - _ACEOF +-iconsdir="${datadir}/icons" ++iconsdir="${prefix}/share/icons" - #defined the below to enable help to work for applets + pixmapsdir="${datadir}/pixmaps" - cat >>confdefs.h <<_ACEOF --#define DATADIR "${prefix}/share" -+#define DATADIR "${datadir}" - _ACEOF +@@ -26099,8 +26107,7 @@ - cat >>confdefs.h <<_ACEOF -@@ -27954,6 +27961,7 @@ - s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t - s,@CDROM_HOST@,$CDROM_HOST,;t t - s,@CDROM_LIBS@,$CDROM_LIBS,;t t -+s,@ACPIINC@,$ACPIINC,;t t + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${iconsdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${iconsdir}"` + GNOME_ICONDIR="$ac_define_dir" + + +@@ -26112,8 +26119,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${pixmapsdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${pixmapsdir}"` + GNOME_PIXMAPSDIR="$ac_define_dir" + + +@@ -26125,8 +26131,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${gladedir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${gladedir}"` + GNOME_GLADEDIR="$ac_define_dir" + + +@@ -26138,8 +26143,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${datadir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${datadir}"` + DATADIR="$ac_define_dir" + + +@@ -26151,8 +26155,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${sysconfdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${sysconfdir}"` + SYSCONFDIR="$ac_define_dir" + + +@@ -26164,8 +26167,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"${libdir}"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "${libdir}"` + LIBDIR="$ac_define_dir" + + +@@ -26177,8 +26179,7 @@ + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +- ac_define_dir=`eval echo $"$prefix"` +- ac_define_dir=`eval echo $ac_define_dir` ++ ac_define_dir=`eval echo "$prefix"` + PREFIX="$ac_define_dir" + + +@@ -27311,6 +27312,7 @@ + s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t ++s,@ACPIINC@,$ACPIINC,;t t s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t + s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t + s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t diff --git a/x11/gnomeapplets2/files/patch-ad b/x11/gnomeapplets2/files/patch-ad deleted file mode 100644 index 5a06416a08c4..000000000000 --- a/x11/gnomeapplets2/files/patch-ad +++ /dev/null @@ -1,354 +0,0 @@ ---- cdplayer/cdplayer.c.orig Tue Apr 16 16:42:54 2002 -+++ cdplayer/cdplayer.c Tue Apr 30 17:31:41 2002 -@@ -671,6 +671,12 @@ - description = TRUE; - break; - case DISC_COMPLETED: -+ led_time(cd->panel.time, -+ stat.relative_address.minute, -+ stat.relative_address.second, -+ cd->panel.track_control.display, -+ stat.track); -+ break; - case DISC_STOP: - case DISC_ERROR: - led_stop(cd->panel.time, cd->panel.track_control.display); ---- /dev/null Mon May 29 02:15:42 2000 -+++ cdplayer/cdrom-freebsd.c Mon May 29 10:37:28 2000 -@@ -0,0 +1,336 @@ -+#include <stdlib.h> -+#include <string.h> -+#include <fcntl.h> -+#include <glib.h> -+#include <sys/ioctl.h> -+#include <unistd.h> -+ -+#include <sys/types.h> -+#include <sys/cdio.h> -+#include "cdrom-interface.h" -+ -+ -+#define ASSIGN_MSF(dest, src) \ -+{ \ -+ (dest).minute = (src).minute; \ -+ (dest).second = (src).second; \ -+ (dest).frame = (src).frame; \ -+} -+ -+int -+cdrom_play(cdrom_device_t cdp, int start, int stop) -+{ -+ struct ioc_play_track ti; -+ -+ ti.start_track = start; -+ ti.start_index = 1; -+ ti.end_track = stop; -+ ti.end_index = 1; -+ -+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) || -+ (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start) -+{ -+ struct ioc_play_msf msf; -+ -+ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR) -+ return DISC_IO_ERROR; -+ msf.start_m = start->minute; -+ msf.start_s = start->second; -+ msf.start_f = start->frame; -+ -+ msf.end_m = cdp->track_info[cdp->nr_track].address.minute; -+ msf.end_s = cdp->track_info[cdp->nr_track].address.second; -+ msf.end_f = cdp->track_info[cdp->nr_track].address.frame; -+ -+ if ((ioctl(cdp->device, CDIOCPREVENT) == -1) || -+ (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_pause(cdrom_device_t cdp) -+{ -+ if (ioctl(cdp->device, CDIOCPAUSE) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_IO_ERROR; -+} -+ -+int -+cdrom_resume(cdrom_device_t cdp) -+{ -+ if (ioctl(cdp->device, CDIOCRESUME) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+ -+int -+cdrom_stop(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCSTOP) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_read_track_info(cdrom_device_t cdp) -+{ -+ struct ioc_toc_header toc; -+ struct ioc_read_toc_single_entry tocentry; -+ -+ int i, j, nr_track; -+ -+ if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ cdp->track0 = toc.starting_track; -+ cdp->track1 = toc.ending_track; -+ nr_track = cdp->track1 - cdp->track0 + 1; -+ if (nr_track <= 0) -+ return DISC_IO_ERROR; -+ -+ if (nr_track != cdp->nr_track) { -+ if (cdp->track_info) -+ g_free(cdp->track_info); -+ cdp->nr_track = nr_track; -+ cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t)); -+ } -+ for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) { -+ tocentry.track = j; -+ tocentry.address_format = CD_MSF_FORMAT; -+ -+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ /* fill the trackinfo field */ -+ cdp->track_info[i].track = j; -+ cdp->track_info[i].audio_track = tocentry.entry.control != -+ 0x04 ? 1 : 0; -+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf); -+ } -+ -+ tocentry.track = 0xAA; -+ tocentry.address_format = CD_MSF_FORMAT; -+ if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ cdp->track_info[i].track = j; -+ cdp->track_info[i].audio_track = 0; -+ ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf); -+ -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat) -+{ -+ struct ioc_read_subchannel subchnl; -+ struct cd_sub_channel_info subchnlinfo; -+ -+ subchnl.address_format = CD_MSF_FORMAT; -+ subchnl.data_format = CD_CURRENT_POSITION; -+ subchnl.track = 0; -+ subchnl.data_len = sizeof(subchnlinfo); -+ subchnl.data = &subchnlinfo; -+ if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) { -+ cdp->my_errno = errno; -+ ioctl(cdp->device, CDIOCALLOW); -+ return DISC_IO_ERROR; -+ } -+ stat->track = subchnlinfo.what.position.track_number; -+ ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf); -+ ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf); -+ switch (subchnlinfo.header.audio_status) { -+ case CD_AS_PLAY_IN_PROGRESS: -+ ioctl(cdp->device, CDIOCPREVENT); -+ stat->audio_status = DISC_PLAY; -+ break; -+ case CD_AS_PLAY_PAUSED: -+ ioctl(cdp->device, CDIOCPREVENT); -+ stat->audio_status = DISC_PAUSED; -+ break; -+ case CD_AS_PLAY_COMPLETED: -+ if (cdrom_read_track_info(cdp) == DISC_IO_ERROR) -+ return DISC_IO_ERROR; -+ stat->track = cdp->nr_track; -+ ASSIGN_MSF(stat->relative_address, -+ cdp->track_info[cdp->nr_track].address); -+ ASSIGN_MSF(stat->absolute_address, -+ cdp->track_info[cdp->nr_track].address); -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_COMPLETED; -+ break; -+ case CD_AS_AUDIO_INVALID: -+ case CD_AS_NO_STATUS: -+ case CD_AS_PLAY_ERROR: -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_STOP; -+ break; -+ default: -+ ioctl(cdp->device, CDIOCALLOW); -+ stat->audio_status = DISC_ERROR; -+ } -+ return (stat->audio_status == DISC_ERROR ? -+ DISC_IO_ERROR : DISC_NO_ERROR); -+} -+ -+cdrom_device_t -+cdrom_open(char *device, int *errcode) -+{ -+ cdrom_device_t cdp; -+ -+ cdp = g_malloc(sizeof(struct cdrom_device)); -+ -+ cdp->device = open(device, O_RDONLY); -+ if (cdp->device == -1) { -+ *errcode = errno; -+ g_free(cdp); -+ return NULL; -+ } -+ cdp->nr_track = 0; -+ cdp->track_info = NULL; -+ return cdp; -+} -+ -+void -+cdrom_close(cdrom_device_t cdp) -+{ -+ if (cdp->nr_track) -+ g_free(cdp->track_info); -+ close(cdp->device); -+ g_free(cdp); -+} -+ -+int -+cdrom_load(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCCLOSE) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_eject(cdrom_device_t cdp) -+{ -+ if ((ioctl(cdp->device, CDIOCEJECT) == -1) || -+ (ioctl(cdp->device, CDIOCALLOW) == -1)) { -+ cdp->my_errno = errno; -+ return DISC_IO_ERROR; -+ } -+ return DISC_NO_ERROR; -+} -+ -+int -+cdrom_next(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ return cdrom_play(cdp, stat.track + 1, cdp->track1); -+} -+ -+int -+cdrom_prev(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ return cdrom_play(cdp, stat.track - 1, cdp->track1); -+} -+ -+int -+cdrom_rewind(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ int track; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ if (stat.absolute_address.second != 0) -+ stat.absolute_address.second--; -+ else { -+ stat.absolute_address.second = 0; -+ if (stat.absolute_address.minute > 0) -+ stat.absolute_address.minute--; -+ } -+ stat.absolute_address.frame = 0; -+ return cdrom_play_msf(cdp, &stat.absolute_address); -+} -+ -+int -+cdrom_ff(cdrom_device_t cdp) -+{ -+ cdrom_device_status_t stat; -+ int track; -+ -+ if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) || -+ (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR)) -+ return DISC_IO_ERROR; -+ stat.absolute_address.second++; -+ if (stat.absolute_address.second >= 60) { -+ stat.absolute_address.minute++; -+ stat.absolute_address.second = 0; -+ } -+ stat.absolute_address.frame = 0; -+ return cdrom_play_msf(cdp, &stat.absolute_address); -+} -+ -+int -+cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length) -+{ -+ int index, s1, s2, i; -+ -+ if ((track < cdp->track0) || (track > cdp->track1)) -+ return DISC_INDEX_OUT_OF_RANGE; -+ index = track - cdp->track0; -+ -+ s1 = cdp->track_info[index + 1].address.second; -+ s2 = cdp->track_info[index].address.second; -+ length->second = s1 = s1 - s2; -+ if (s1 < 0) { -+ i = 1; -+ length->second = s1 + 60; -+ } else -+ i = 0; -+ -+ length->minute = cdp->track_info[index + 1].address.minute - -+ cdp->track_info[index].address.minute - i; -+ -+ return 0; -+} diff --git a/x11/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi index 4025a9a360f1..ebaa93f7e670 100644 --- a/x11/gnomeapplets2/files/patch-battstat-acpi +++ b/x11/gnomeapplets2/files/patch-battstat-acpi @@ -1,58 +1,3 @@ ---- battstat/Makefile.in.orig Mon Sep 27 18:39:44 2004 -+++ battstat/Makefile.in Mon Sep 27 18:40:56 2004 -@@ -173,6 +173,8 @@ - pixmapsdir = $(datadir)/pixmaps - pixmaps_DATA = battstat.png - -+ACPIINC = @ACPIINC@ -+ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a - @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm - @NEED_LIBAPM_FALSE@APMLIB = -@@ -191,6 +193,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DDATA_DIR=\"$(datadir)\" \ - -DGLADE_DIR=\"$(gladedir)\" \ - -DG_LOG_DOMAIN=\"battstat_applet\" \ -@@ -205,7 +208,9 @@ - properties.c \ - battstat_applet.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - - battstat_applet_2_LDADD = \ -@@ -242,7 +247,7 @@ - PROGRAMS = $(libexec_PROGRAMS) - - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ -- battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT) -+ battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a -@@ -259,6 +264,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -330,6 +336,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ - --- battstat/acpi-freebsd.h.orig Mon Sep 27 18:39:30 2004 +++ battstat/acpi-freebsd.h Mon Sep 27 18:39:30 2004 @@ -0,0 +1,45 @@ @@ -101,9 +46,171 @@ +void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + +#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/acpi-freebsd.c.orig Tue Sep 28 16:55:52 2004 -+++ battstat/acpi-freebsd.c Tue Sep 28 17:00:32 2004 -@@ -0,0 +1,213 @@ +--- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 ++++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 +@@ -55,9 +55,10 @@ + PROGRAMS = $(libexec_PROGRAMS) + am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ + battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ +- acpi-linux.$(OBJEXT) ++ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) + battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) + am__DEPENDENCIES_1 = ++ACPIINC = @ACPIINC@ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ + @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a + battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +@@ -66,6 +67,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po +@@ -336,6 +338,7 @@ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBGLADE_CFLAGS) \ + $(APMINC) \ ++ $(ACPIINC) \ + -DG_LOG_DOMAIN=\"battstat_applet\" + + battstat_applet_2_SOURCES = \ +@@ -345,7 +348,9 @@ + battstat_applet.c \ + power-management.c \ + acpi-linux.c \ +- acpi-linux.h ++ acpi-linux.h \ ++ acpi-freebsd.c \ ++ acpi-freebsd.h + + battstat_applet_2_LDADD = \ + $(GNOME_APPLETS_LIBS) \ +@@ -439,6 +444,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ +--- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 ++++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 +@@ -953,6 +953,7 @@ + "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", + "Davyd Madeley <davyd@madeley.id.au>", + "Ryan Lortie <desrt@desrt.ca>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", + NULL + }; + +--- battstat/power-management.c.orig Thu Jan 13 23:06:40 2005 ++++ battstat/power-management.c Wed Feb 16 02:58:10 2005 +@@ -76,6 +76,14 @@ + #ifdef __FreeBSD__ + + #include <machine/apm_bios.h> ++#include "acpi-freebsd.h" ++ ++struct acpi_info acpiinfo; ++gboolean using_acpi; ++int acpi_count; ++struct apm_info apminfo; ++ ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); + + #define APMDEVICE "/dev/apm" + +@@ -86,32 +94,48 @@ + FreeBSD. Each time this functions is called (once every second) + the APM device is opened, read from and then closed. + */ +- struct apm_info apminfo; + int fd; + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- fd = open(APMDEVICE, O_RDONLY); +- if (fd == -1) +- { +- pm_initialised = 0; +- return ERR_OPEN_APMDEV; ++ if (using_acpi) { ++ fd = -1; ++ if (acpi_count <= 0) { ++ acpi_count = 30; ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ acpi_count--; + } ++ else { ++ fd = open(APMDEVICE, O_RDONLY); ++ if (fd == -1) { ++ return ERR_OPEN_APMDEV; ++ } + +- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) +- err(1, "ioctl(APMIO_GETINFO)"); ++ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) ++ err(1, "ioctl(APMIO_GETINFO)"); + +- close(fd); ++ close(fd); + +- if(apminfo.ai_status == 0) +- return ERR_APM_E; ++ if(apminfo.ai_status == 0) ++ return ERR_APM_E; ++ ++ } ++ ++ if (using_acpi) { ++ acpi_process_event(&acpiinfo); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } + + status->present = TRUE; + status->on_ac_power = apminfo.ai_acline ? 1 : 0; + status->state = apminfo.ai_batt_stat; + status->percent = apminfo.ai_batt_life; + status->charging = (status->state == 3) ? TRUE : FALSE; +- status->minutes = apminfo.ai_batt_time; ++ if (using_acpi) ++ status->minutes = apminfo.ai_batt_time; ++ else ++ status->minutes = (int) (apminfo.ai_batt_time/60.0); + + return NULL; + } +@@ -339,6 +363,13 @@ + G_IO_IN | G_IO_ERR | G_IO_HUP, + acpi_callback, NULL); + } ++#elif defined(__FreeBSD__) ++ if (acpi_freebsd_init(&acpiinfo)) { ++ using_acpi = TRUE; ++ acpi_count = 0; ++ } ++ else ++ using_acpi = FALSE; + #endif + pm_initialised = 1; + +@@ -360,6 +391,10 @@ + g_source_remove(acpiwatch); + acpiwatch = 0; + acpi_linux_cleanup(&acpiinfo); ++ } ++#elif defined(__FreeBSD__) ++ if (using_acpi) { ++ acpi_freebsd_cleanup(&acpiinfo); + } + #endif + +--- battstat/acpi-freebsd.c.orig Mon Feb 28 01:41:08 2005 ++++ battstat/acpi-freebsd.c Mon Feb 28 03:00:11 2005 +@@ -0,0 +1,206 @@ +/* battstat A GNOME battery meter for laptops. + * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> + * @@ -121,7 +228,7 @@ + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * -+ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $ ++ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ + */ + +/* @@ -147,7 +254,6 @@ +#include <glib.h> + +#include <dev/acpica/acpiio.h> -+#include <contrib/dev/acpica/acpi.h> + +#include "acpi-freebsd.h" + @@ -300,160 +406,14 @@ + } + apminfo->ai_batt_life = life; + if (!charging) { -+ apminfo->ai_batt_time = time * 60; ++ apminfo->ai_batt_time = time; + } + else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60); ++ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); + } + else -+ /* This multiplication is a hack to make sure the -1 survives so the applet -+ * can process it. Battstat wants the remaining time in minutes, but -+ * ai_batt_time is in seconds. In order to make both ACPI and APM work -+ * with the fewest amount of hacks, we will just assume everything is -+ * in seconds. -+ */ -+ apminfo->ai_batt_time = -1 * 60; ++ apminfo->ai_batt_time = -1; + + return TRUE; +} +#endif ---- battstat/battstat_applet.c.orig Mon Sep 13 04:33:31 2004 -+++ battstat/battstat_applet.c Fri Oct 1 16:46:01 2004 -@@ -62,6 +62,9 @@ - #ifdef __linux__ - #include "acpi-linux.h" - #endif -+#ifdef __FreeBSD__ -+#include "acpi-freebsd.h" -+#endif - - #ifndef gettext_noop - #define gettext_noop(String) (String) -@@ -237,6 +240,24 @@ - #endif - - #ifdef __FreeBSD__ -+struct acpi_info acpiinfo; -+gboolean using_acpi; -+int acpi_count; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); -+ -+gboolean acpi_callback (gpointer data) -+{ -+ ProgressData * battstat = (ProgressData *) data; -+ -+ if (acpi_process_event(&acpiinfo)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ pixmap_timeout(data); -+ } -+ -+ return TRUE; -+} -+ - void - apm_readinfo (PanelApplet *applet, ProgressData * battstat) - { -@@ -247,13 +268,22 @@ - int fd; - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) cleanup (applet, 1); -+ if (using_acpi) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else { -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) cleanup (applet, 1); - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); -+ } - } - #elif defined(__NetBSD__) || defined(__OpenBSD__) - void -@@ -361,7 +391,7 @@ - - #ifdef __FreeBSD__ - acline_status = apminfo.ai_acline ? 1 : 0; -- time = apminfo.ai_batt_time; -+ time = (int) (apminfo.ai_batt_time / 60); - batt_life = apminfo.ai_batt_life; - #elif defined (__NetBSD__) || defined(__OpenBSD__) - acline_status = apminfo.ac_state ? 1 : 0; -@@ -375,8 +405,10 @@ - - if (batt_life > 100) batt_life = 100; - -- hours = time / 60; -- mins = time % 60; -+ if (time >= 0) { -+ hours = time / 60; -+ mins = time % 60; -+ } - - if (acline_status && batt_life == 100) - return g_strdup_printf (_("Battery charged (%d%%)"), batt_life); -@@ -912,6 +944,13 @@ - pdata->acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); - } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (pdata->acpiwatch != 0) -+ g_source_remove(pdata->acpiwatch); -+ pdata->acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); -+ } - #endif - - if (pdata->suspend_cmd) -@@ -1052,6 +1091,7 @@ - "Lennart Poettering <lennart@poettering.de> (Linux ACPI support)", - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@ucc.asn.au>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - -@@ -1760,11 +1800,18 @@ - using_acpi = TRUE; - acpi_count = 0; - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; - #endif - apm_readinfo (applet, NULL); - - #ifdef __FreeBSD__ -- if(apminfo.ai_status == 0) cleanup (applet, 2); -+ if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2); - #endif - - battstat = g_new0 (ProgressData, 1); -@@ -1803,6 +1850,10 @@ - battstat->acpiwatch = g_io_add_watch (acpiinfo.channel, - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, battstat); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat); - } - #endif - diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in index ecaea9dab09e..a6bed2361540 100644 --- a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in +++ b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in @@ -5,7 +5,7 @@ <owner>battstat-applet</owner> <type>string</type> - <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/apm -s</default> ++ <default>/usr/sbin/zzz</default> <locale name="C"> <short>Suspend Command</short> <long>Command to send to suspend the computer</long> diff --git a/x11/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd new file mode 100644 index 000000000000..48f2ebb6c5b1 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-cpufreq-freebsd @@ -0,0 +1,514 @@ +--- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 ++++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 +@@ -55,6 +55,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -68,6 +69,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ +@@ -336,6 +338,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -419,6 +422,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ +--- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 ++++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 +@@ -0,0 +1,48 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifndef __CPUFREQ_MONITOR_SYSCTL_H__ ++#define __CPUFREQ_MONITOR_SYSCTL_H__ ++ ++#include <glib-object.h> ++#include "cpufreq-monitor.h" ++ ++#define TYPE_CPUFREQ_MONITOR_SYSCTL (cpufreq_monitor_sysctl_get_type ()) ++#define CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl)) ++#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++#define IS_CPUFREQ_MONITOR_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL)) ++#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass)) ++ ++typedef struct _CPUFreqMonitorSysctl CPUFreqMonitorSysctl; ++typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass; ++ ++struct _CPUFreqMonitorSysctl { ++ CPUFreqMonitor parent; ++}; ++ ++struct _CPUFreqMonitorSysctlClass { ++ CPUFreqMonitorClass parent_class; ++}; ++ ++GType cpufreq_monitor_sysctl_get_type (); ++CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); ++ ++#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 +@@ -22,6 +22,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + + #include "cpufreq-monitor-cpuinfo.h" +@@ -102,6 +106,7 @@ + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -109,6 +114,9 @@ + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -118,6 +126,7 @@ + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -178,6 +187,12 @@ + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 +@@ -16,13 +16,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -30,6 +38,7 @@ + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -48,6 +57,20 @@ + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 ++++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 +@@ -0,0 +1,269 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#include <glib.h> ++#include <glib/gi18n.h> ++ ++#include <string.h> ++ ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++ ++#include "cpufreq-monitor-sysctl.h" ++#include "cpufreq-monitor-protected.h" ++ ++#define PARENT_TYPE TYPE_CPUFREQ_MONITOR ++ ++#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected)) ++ ++static void cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass); ++static void cpufreq_monitor_sysctl_finalize (GObject *object); ++ ++static void cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor); ++static GList *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor); ++ ++static gboolean cpufreq_monitor_sysctl_get (gpointer gdata); ++ ++ ++static CPUFreqMonitorClass *parent_class = NULL; ++ ++typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected; ++ ++GType cpufreq_monitor_sysctl_get_type () ++{ ++ static GType type = 0; ++ ++ if (!type) { ++ static const GTypeInfo info = { ++ sizeof (CPUFreqMonitorSysctlClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cpufreq_monitor_sysctl_class_init, ++ NULL, ++ NULL, ++ sizeof (CPUFreqMonitorSysctl), ++ 0, ++ NULL ++ }; ++ ++ type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static void ++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass); ++ ++ parent_class = g_type_class_peek_parent (klass); ++ ++ monitor_class->run = cpufreq_monitor_sysctl_run; ++ monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies; ++ ++ object_class->finalize = cpufreq_monitor_sysctl_finalize; ++} ++ ++static void ++cpufreq_monitor_sysctl_finalize (GObject *object) ++{ ++ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object)); ++ ++ if (G_OBJECT_CLASS (parent_class)->finalize) ++ (* G_OBJECT_CLASS (parent_class)->finalize) (object); ++} ++ ++CPUFreqMonitor * ++cpufreq_monitor_sysctl_new (guint cpu) ++{ ++ CPUFreqMonitorSysctl *monitor; ++ ++ monitor = g_object_new (TYPE_CPUFREQ_MONITOR_SYSCTL, "cpu", cpu, NULL); ++ ++ return CPUFREQ_MONITOR (monitor); ++} ++ ++static gboolean ++cpufreq_monitor_sysctl_get (gpointer gdata) ++{ ++ gint fmax, fmin, ifreq; ++ gchar *freq, *perc, *unit, *governor; ++ gboolean changed; ++ size_t len; ++ gchar *freq_oid; ++ CPUFreqMonitorSysctl *monitor; ++ CPUFreqMonitorProtected *private; ++ ++ monitor = (CPUFreqMonitorSysctl *) gdata; ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->available_freqs == NULL) { ++ if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor))) ++ return FALSE; ++ } ++ ++ fmax = atoi ((gchar *) private->available_freqs->data); ++ fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1))); ++ ++ len = sizeof (ifreq); ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu); ++ ++ if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) { ++ g_free (freq_oid); ++ return FALSE; ++ } ++ ++ ifreq *= 1000; ++ ++ if (ifreq == fmax) ++ governor = g_strdup ("performance"); ++ else if (ifreq == fmin) ++ governor = g_strdup ("economy"); ++ else ++ governor = g_strdup ("other"); ++ ++ freq = parent_class->get_human_readable_freq (ifreq); ++ perc = parent_class->get_human_readable_perc (fmax, ifreq); ++ unit = parent_class->get_human_readable_unit (ifreq); ++ ++ changed = FALSE; ++ ++ if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) { ++ changed = TRUE; ++ } ++ ++ if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) { ++ changed = TRUE; ++ } ++ ++ parent_class->free_data (CPUFREQ_MONITOR (monitor)); ++ ++ private->governor = governor; ++ private->freq = freq; ++ private->perc = perc; ++ private->unit = unit; ++ ++ if (private->governor == NULL) ++ return FALSE; ++ if (private->freq == NULL) ++ return FALSE; ++ if (private->perc == NULL) ++ return FALSE; ++ if (private->unit == NULL) ++ return FALSE; ++ ++ if (changed) ++ g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0); ++ ++ return TRUE; ++} ++ ++static void ++cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor) ++{ ++ CPUFreqMonitorProtected *private; ++ ++ g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor)); ++ ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->timeout_handler > 0) ++ g_source_remove (private->timeout_handler); ++ ++ private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor); ++} ++ ++static void ++free_string (gpointer str, gpointer gdata) ++{ ++ if (str) g_free (str); ++} ++ ++static GList * ++cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor) ++{ ++ CPUFreqMonitorProtected *private; ++ gchar *levels_oid, *levels; ++ gchar **levelsp, **l; ++ gint mib[4]; ++ size_t len; ++ ++ g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL); ++ ++ private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); ++ ++ if (private->available_freqs) { ++ g_list_foreach (private->available_freqs, ++ free_string, NULL); ++ g_list_free (private->available_freqs); ++ private->available_freqs = NULL; ++ } ++ ++ levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels", ++ private->cpu); ++ len = 4; ++ sysctlnametomib (levels_oid, mib, &len); ++ len = sizeof (levels); ++ g_free (levels_oid); ++ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) ++ return NULL; ++ ++ levels = g_malloc (len); ++ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) ++ return NULL; ++ ++ levelsp = g_strsplit (levels, " ", 0); ++ g_free (levels); ++ ++ for (l = levelsp; l && *l; l++) { ++ gchar **frpr; ++ ++ frpr = g_strsplit (*l, "/", 0); ++ if (frpr && frpr[0] != NULL) { ++ /* sysctl format is %d/%d where the ++ * first %d is the frequency, and ++ * the second is the power used in ++ * mW. ++ */ ++ int freq = atoi (frpr[0]); ++ private->available_freqs = ++ g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000)); ++ } ++ g_strfreev (frpr); ++ } ++ ++ g_strfreev (levelsp); ++ ++ return private->available_freqs; ++} ++#endif /* __FreeBSD__ */ +--- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 ++++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 +@@ -16,6 +16,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <config.h> +@@ -25,6 +26,10 @@ + #include <panel-applet-gconf.h> + #include <glade/glade.h> + #include <glib/gi18n.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + + #include "cpufreq-applet.h" +@@ -192,6 +197,7 @@ + { + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -231,6 +237,7 @@ + cpufreq_applet_get_max_cpu () + { + gint mcpu = -1; ++#ifndef __FreeBSD__ + gchar *file = NULL; + + do { +@@ -253,6 +260,14 @@ + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#else ++ size_t len; ++ ++ len = sizeof (mcpu); ++ ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; ++#endif /* __FreeBSD__ */ + + if (mcpu >= 0) + return mcpu; diff --git a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd new file mode 100644 index 000000000000..f577a0fed39b --- /dev/null +++ b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd @@ -0,0 +1,373 @@ +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 +@@ -53,7 +53,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -61,6 +61,7 @@ + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ +@@ -310,6 +311,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -385,6 +387,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +--- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 ++++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 +@@ -0,0 +1,51 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#ifndef __CPUFREQ_SYSCTL_H__ ++#define __CPUFREQ_SYSCTL_H__ ++ ++#include <glib-object.h> ++ ++#include "cpufreq.h" ++ ++#define TYPE_CPUFREQ_SYSCTL (cpufreq_sysctl_get_type ()) ++#define CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl)) ++#define CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) ++#define IS_CPUFREQ_SYSCTL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL)) ++#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL)) ++#define CPUFREQ_SYSCTL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass)) ++ ++typedef struct _CPUFreqSysctl CPUFreqSysctl; ++typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass; ++typedef struct _CPUFreqSysctlPriv CPUFreqSysctlPriv; ++ ++struct _CPUFreqSysctl { ++ CPUFreq parent; ++}; ++ ++struct _CPUFreqSysctlClass { ++ CPUFreqClass parent_class; ++}; ++ ++ ++GType cpufreq_sysctl_get_type (); ++CPUFreqSysctl *cpufreq_sysctl_new (); ++ ++#endif /* __CPUFREQ_SYSCTL_H__ */ +--- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 ++++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 +@@ -16,6 +16,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -35,6 +39,9 @@ + gulong frequency = 0; + poptContext ctx; + gint nextopt; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + CPUFreq *cfq; + + struct poptOption options[] = { +@@ -76,10 +83,15 @@ + + poptFreeContext(ctx); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD __ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 ++++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 +@@ -0,0 +1,235 @@ ++/* ++ * Copyright (C) 2001, 2002 Free Software Foundation ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this library; if not, write to the Free ++ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * ++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org> ++ */ ++ ++#include <glib.h> ++#include <stdio.h> ++#include <stdlib.h> ++ ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ ++ ++#include "cpufreq-sysctl.h" ++ ++#define PARENT_TYPE TYPE_CPUFREQ ++ ++#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate)) ++ ++static void cpufreq_sysctl_init (CPUFreqSysctl *cfq); ++static void cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass); ++static void cpufreq_sysctl_finalize (GObject *object); ++ ++static void cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor); ++static void cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency); ++ ++static void cpufreq_sysctl_setup (CPUFreqSysctl *cfq); ++ ++static GObjectClass *parent_class = NULL; ++ ++typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate; ++ ++struct _CPUFreqSysctlPrivate ++{ ++ gint pmax; ++}; ++ ++GType cpufreq_sysctl_get_type () ++{ ++ static GType type = 0; ++ ++ if (!type) { ++ static const GTypeInfo info = { ++ sizeof (CPUFreqSysctlClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cpufreq_sysctl_class_init, ++ NULL, ++ NULL, ++ sizeof (CPUFreqSysctl), ++ 0, ++ (GInstanceInitFunc) cpufreq_sysctl_init ++ }; ++ ++ type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl", ++ &info, 0); ++ } ++ ++ return type; ++} ++ ++static void ++cpufreq_sysctl_init (CPUFreqSysctl *cfq) ++{ ++ CPUFreqSysctlPrivate *private; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); ++} ++ ++static void ++cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass); ++ ++ parent_class = g_type_class_peek_parent (klass); ++ ++ g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate)); ++ ++ cfq_class->set_governor = cpufreq_sysctl_set_governor; ++ cfq_class->set_frequency = cpufreq_sysctl_set_frequency; ++ ++ object_class->finalize = cpufreq_sysctl_finalize; ++} ++ ++static void ++cpufreq_sysctl_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (parent_class)->finalize) ++ (* G_OBJECT_CLASS (parent_class)->finalize) (object); ++} ++ ++CPUFreqSysctl * ++cpufreq_sysctl_new () ++{ ++ CPUFreqSysctl *cfq; ++ ++ cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL); ++ ++ cpufreq_sysctl_setup (cfq); ++ ++ return cfq; ++} ++ ++static void ++cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor) ++{ ++ /* Not implemented. */ ++} ++ ++static void ++cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency) ++{ ++ gint cpu, i; ++ size_t len; ++ gchar *freq_oid; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL); ++ ++ frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/ ++ ++ for (i = 0; i < cpu; i++) { ++ freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i); ++ ++ sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency)); ++ g_free (freq_oid); ++ } ++} ++ ++ ++static void ++cpufreq_sysctl_setup (CPUFreqSysctl *cfq) ++{ ++ guint cpu; ++ gint fmax, fmin; ++ gint pmax; ++ gint ifreq; ++ gint mib[4]; ++ gchar *governor, *levels; ++ gchar **levelsp, **frpr, **l; ++ size_t len; ++ CPUFreqSysctlPrivate *private; ++ ++ g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq)); ++ ++ private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq); ++ ++ pmax = 100; ++ fmax = 0; ++ fmin = 0; ++ ifreq = 0; ++ ++ private->pmax = pmax; ++ ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1) ++ cpu = 1; ++ ++ len = 4; ++ sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len); ++ len = sizeof (levels); ++ ++ if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch dev.cpu.0.freq_levels"); ++ return; ++ } ++ ++ levels = g_malloc (len); ++ if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch data for dev.cpu.0.freq_levels"); ++ return; ++ } ++ ++ levelsp = g_strsplit (levels, " ", 0); ++ g_free (levels); ++ ++ frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */ ++ if (frpr && frpr[0] != NULL) ++ fmax = atoi (frpr[0]); ++ g_strfreev (frpr); ++ ++ for (l = levelsp; l && *l; l++) /* Walk to the last frequency */ ++ ; ++ ++ l --; ++ frpr = g_strsplit (*l, "/", 0); ++ if (frpr && frpr[0] != NULL) ++ fmin = atoi (frpr[0]); ++ ++ g_strfreev (frpr); ++ g_strfreev (levelsp); ++ ++ len = sizeof (ifreq); ++ if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) { ++ g_warning ("Failed to fetch data for dev.cpu.0.freq"); ++ return; ++ } ++ ++ if (ifreq == fmax) ++ governor = g_strdup ("performance"); ++ else if (ifreq == fmin) ++ governor = g_strdup ("economy"); ++ else ++ governor = g_strdup ("other"); ++ ++ fmax *= 1000; ++ fmin *= 1000; ++ ++ g_object_set (G_OBJECT (cfq), "n_cpu", cpu, ++ "sc_max", fmax, "sc_min", fmin, ++ "governor", governor, NULL); ++ ++ g_free (governor); ++} diff --git a/x11/gnomeapplets2/files/patch-gkb-new_presets.c b/x11/gnomeapplets2/files/patch-gkb-new_presets.c deleted file mode 100644 index f90708170e00..000000000000 --- a/x11/gnomeapplets2/files/patch-gkb-new_presets.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gkb-new/preset.c.orig Fri Mar 14 09:13:44 2003 -+++ gkb-new/preset.c Fri Mar 14 09:13:54 2003 -@@ -42,7 +42,7 @@ - - /* TODO: user's local presets */ - -- text = gnome_unconditional_datadir_file ("gnome/gkb/"); -+ text = gnome_unconditional_datadir_file ("gkb/"); - if (!text) - return NULL; - dir = opendir (text); diff --git a/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c new file mode 100644 index 000000000000..14c0190b2eed --- /dev/null +++ b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c @@ -0,0 +1,9 @@ +--- gweather/weather-iwin.c.orig Tue Dec 21 18:42:38 2004 ++++ gweather/weather-iwin.c Tue Dec 21 18:42:47 2004 +@@ -1,5 +1,6 @@ + /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */ + ++#include <sys/types.h> + #include <regex.h> + #include <gnome.h> + #include "weather.h" diff --git a/x11/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c new file mode 100644 index 000000000000..cdc1921ab4c7 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-gweather_weather.c @@ -0,0 +1,12 @@ +--- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 ++++ gweather/weather.c Tue Mar 1 12:36:54 2005 +@@ -20,7 +20,9 @@ + #include <string.h> + #include <ctype.h> + #include <math.h> ++#ifndef __FreeBSD__ + #include <values.h> ++#endif + + #ifdef __FreeBSD__ + #include <sys/types.h> diff --git a/x11/gnomeapplets2/files/patch-modemlights_Makefile.in b/x11/gnomeapplets2/files/patch-modemlights_Makefile.in new file mode 100644 index 000000000000..874884722127 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-modemlights_Makefile.in @@ -0,0 +1,10 @@ +--- modemlights/Makefile.in.orig Fri Jan 14 00:08:52 2005 ++++ modemlights/Makefile.in Fri Jan 14 00:09:20 2005 +@@ -319,6 +319,7 @@ + modem_applet_LDADD = \ + $(GNOME_APPLETS_LIBS) \ + $(LIBGLADE_LIBS) \ ++ -lutil \ + $(MODEMLIGHTS_LIBS) + + uidir = $(datadir)/gnome-2.0/ui diff --git a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c new file mode 100644 index 000000000000..f4fb13717732 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c @@ -0,0 +1,22 @@ +--- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 ++++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 +@@ -24,12 +24,19 @@ + + #include <panel-applet.h> + #include <fcntl.h> ++#ifndef __FreeBSD__ + #include <pty.h> ++#endif + #include <sys/poll.h> + #include <sys/types.h> + #include <sys/wait.h> + #include <libxml/tree.h> + #include <glade/glade.h> ++#ifdef __FreeBSD__ ++#include <sys/ioctl.h> ++#include <termios.h> ++#include <libutil.h> ++#endif + + #include "modem-applet.h" + diff --git a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c deleted file mode 100644 index 636b36b21cb9..000000000000 --- a/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c +++ /dev/null @@ -1,349 +0,0 @@ ---- wireless/wireless-applet.c.orig Sat Oct 30 09:46:28 2004 -+++ wireless/wireless-applet.c Mon Dec 6 21:24:29 2004 -@@ -30,12 +30,25 @@ - #include <math.h> - #include <dirent.h> - -+#ifdef __FreeBSD__ -+#include <sys/socket.h> -+#include <sys/ioctl.h> -+#include <net/if.h> -+#include <net/if_var.h> -+#include <dev/an/if_aironet_ieee.h> -+#include <dev/wi/if_wavelan_ieee.h> -+#endif -+ - #include <gnome.h> - #include <panel-applet.h> - #include <panel-applet-gconf.h> - #include <glade/glade.h> - -+#ifdef __FreeBSD__ -+#define CFG_DEVICE "an0" -+#else - #define CFG_DEVICE "eth0" -+#endif - #define CFG_UPDATE_INTERVAL 2 - - typedef enum { -@@ -92,6 +105,12 @@ - WirelessApplet *applet); - static void wireless_applet_about_cb (BonoboUIComponent *uic, - WirelessApplet *applet); -+#ifdef __FreeBSD__ -+static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq); -+static void get_an_data(WirelessApplet *applet, char *device, long int *level); -+static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq); -+static void get_wi_data(WirelessApplet *applet, char *device, long int *level); -+#endif - static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data); - - static const BonoboUIVerb wireless_menu_verbs [] = { -@@ -159,9 +178,11 @@ - g_free (tltp); - - /* Update the image */ -+#ifndef __FreeBSD__ - percent = CLAMP (percent, -1, 100); -+#endif - -- if (percent < 0) -+ if (percent < 0 || percent > 100) - state = PIX_BROKEN; - else if (percent == 0) - state = PIX_NO_LINK; -@@ -192,6 +213,7 @@ - int percent; - - /* Calculate the percentage based on the link quality */ -+#ifndef __FreeBSD__ - if (level < 0) { - percent = -1; - } else { -@@ -202,6 +224,9 @@ - percent = CLAMP (percent, 0, 100); - } - } -+#else -+ percent = (int)level; -+#endif - - wireless_applet_draw (applet, percent); - } -@@ -244,14 +269,179 @@ - } - } - -+#ifdef __FreeBSD__ -+static int -+wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ bzero((char *)&ifr, sizeof(ifr)); -+ -+ strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t)wreq; -+ -+ s = socket(AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) -+ { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "Socket Error", -+ NULL); -+ return 0; -+ } -+ -+ if (ioctl(s, SIOCGWAVELAN, &ifr) == -1) -+ { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); -+ close (s); -+ return 0; -+ } -+ -+ close(s); -+ -+ return 1; -+} -+ -+static void -+get_wi_data (WirelessApplet *applet, char *device, long int *level) -+{ -+ struct wi_req wreq; -+ long int signal_strength; -+ -+ bzero((char *)&wreq, sizeof(wreq)); -+ -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_COMMS_QUALITY; -+ -+ (void)wi_getval(applet, device, &wreq); -+ -+ signal_strength = (long int) (wreq.wi_val[1]); -+ -+#ifdef WI_RID_READ_APS -+ if (signal_strength <= 0) { -+ /* we fail to get signal strength by usual means, try another way */ -+ static time_t last_scan; -+ static long int cached; -+ time_t now = time(NULL); -+ -+ /* XXX: this is long operation, and we will scan station not often then one in 5 secs */ -+ if (now > last_scan + 5) { -+ struct wi_apinfo *w; -+ int nstations; -+ -+ bzero((char *)&wreq, sizeof(wreq)); -+ wreq.wi_len = WI_MAX_DATALEN; -+ wreq.wi_type = WI_RID_READ_APS; -+ -+ (void)wi_getval(applet, device, &wreq); -+ -+ nstations = *(int *)wreq.wi_val; -+ if (nstations > 0) { -+ w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int)); -+ signal_strength = (long int)w->signal; -+ } -+ -+ cached = signal_strength; -+ last_scan = now; -+ } else { -+ signal_strength = cached; -+ } -+ } -+#endif -+ -+ memcpy(level, &signal_strength, sizeof( *level )); -+ -+ return; -+} -+ -+static int -+an_getval(WirelessApplet *applet, char *device, struct an_req *areq) -+{ -+ struct ifreq ifr; -+ int s; -+ -+ bzero((char *)&ifr, sizeof(ifr)); -+ -+ strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)); -+ ifr.ifr_data = (caddr_t)areq; -+ -+ s = socket(AF_INET, SOCK_DGRAM, 0); -+ -+ if (s == -1) { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "Socket Error", -+ NULL); -+ return 0; -+ } -+ -+ if (ioctl(s, SIOCGAIRONET, &ifr) == -1) { -+ gtk_tooltips_set_tip (applet->tips, -+ GTK_WIDGET (applet), -+ "ioctl Error", -+ NULL); -+ close (s); -+ return 0; -+ } -+ -+ close(s); -+ return 1; -+} -+ -+static void -+get_an_data (WirelessApplet *applet, char *device, long int *level) -+{ -+ struct an_req areq; -+ struct an_ltv_status *sts; -+#ifdef AN_RID_RSSI_MAP -+ struct an_ltv_rssi_map an_rssimap; -+#endif -+ long int signal_strength; -+ int rssimap_valid = 0; -+ -+#ifdef AN_RID_RSSI_MAP -+ an_rssimap.an_len = sizeof(an_rssimap); -+ an_rssimap.an_type = AN_RID_RSSI_MAP; -+ rssimap_valid = an_getval(applet, device, (struct an_req*)&an_rssimap); -+#endif -+ -+ areq.an_len = sizeof(areq); -+ areq.an_type = AN_RID_STATUS; -+ -+ (void)an_getval(applet, device, &areq); -+ -+ sts = (struct an_ltv_status *)&areq; -+#ifdef AN_RID_RSSI_MAP -+ if (rssimap_valid) -+ signal_strength = (long int)(an_rssimap.an_entries[ -+ sts->an_normalized_strength].an_rss_pct); -+ else -+ signal_strength = (long int)(sts->an_normalized_strength); -+#else -+ signal_strength = (long int)(sts->an_normalized_rssi); -+#endif -+ memcpy(level, &signal_strength, sizeof(level)); -+} -+#endif -+ - /* check stats, modify the state attribute */ - static void - wireless_applet_read_device_state (WirelessApplet *applet) - { -- long int level, noise; -- double link; -+ long int level; - char device[256]; -+#ifdef __FreeBSD__ -+ struct if_nameindex *ifstart, *ifs; -+#else -+ long int noise; -+ double link; - char line[256]; -+#endif - gboolean found = FALSE; - - /* resest list of available wireless devices */ -@@ -259,8 +449,37 @@ - g_list_free (applet->devices); - applet->devices = NULL; - -+#ifdef __FreeBSD__ -+ ifs = ifstart = if_nameindex (); -+#endif -+ - /* Here we begin to suck... */ - do { -+#ifdef __FreeBSD__ -+ if (ifs == NULL || ifs->if_name == NULL) { -+ break; -+ } -+ strlcpy (device, ifs->if_name, 6); -+ if (g_strncasecmp (device, "an", 2)==0) { -+ applet->devices = g_list_prepend (applet->devices, g_strdup (device)); -+ if (g_strcasecmp (applet->device, device)==0) { -+ get_an_data (applet, device, &level); -+ wireless_applet_update_state (applet, device, 0, level, 0); -+ found = TRUE; -+ } -+ } -+ else if (g_strncasecmp (device, "wi", 2)==0 || -+ g_strncasecmp (device, "ath", 3)==0 || -+ g_strncasecmp (device, "ndis", 4)==0) { -+ applet->devices = g_list_prepend (applet->devices, g_strdup (device)); -+ if (g_strcasecmp (applet->device, device)==0) { -+ get_wi_data (applet, device, &level); -+ wireless_applet_update_state (applet, device, 0, level, 0); -+ found = TRUE; -+ } -+ } -+ ifs++; -+#else - char *ptr; - - fgets (line, 256, applet->file); -@@ -294,6 +513,7 @@ - found = TRUE; - } - } -+#endif - } while (1); - - if (g_list_length (applet->devices)==1) { -@@ -305,17 +525,23 @@ - } - - /* rewind the /proc/net/wireless file */ -+#ifdef __FreeBSD__ -+ if_freenameindex(ifstart); -+#else - rewind (applet->file); -+#endif - } - - static int - wireless_applet_timeout_handler (WirelessApplet *applet) - { -+#ifndef __FreeBSD__ - if (applet->file == NULL) { - wireless_applet_update_state (applet, - applet->device, -1, -1, -1); - return FALSE; - } -+#endif - - wireless_applet_read_device_state (applet); - -@@ -364,10 +590,12 @@ - static void - start_file_read (WirelessApplet *applet) - { -- applet->file = fopen ("/proc/net/wireless", "rt"); -+#ifndef __FreeBSD__ -+ applet->file1 = fopen ("/proc/net/wireless", "rt"); - if (applet->file == NULL) { - show_error_dialog (applet, _("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect.")); - } -+#endif - } - - static void -@@ -670,8 +898,10 @@ - applet->prefs = NULL; - } - -+#ifndef __FreeBSD__ - if (applet->file) - fclose (applet->file); -+#endif - if (applet->tips) - g_object_unref (applet->tips); - } diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index e3410d50878c..0f24cdc75ecc 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -1,13 +1,12 @@ -bin/gkb_xmmap -bin/gnome-keyboard-layout +%%CPUFREQ%%bin/cpufreq-selector bin/gswitchit-plugins-capplet %%BATTERY%%etc/sound/events/battstat_applet.soundlist -etc/sound/events/mailcheck.soundlist +include/libgswitchit/gswitchit_config.h include/libgswitchit/gswitchit_plugin.h -include/libgswitchit/gswitchit_xkb_config.h libdata/bonobo/servers/GNOME_AccessxStatusApplet.server %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server libdata/bonobo/servers/GNOME_CDPlayerApplet.server +%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server libdata/bonobo/servers/GNOME_CharpickerApplet.server libdata/bonobo/servers/GNOME_DriveMountApplet.server libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server @@ -17,198 +16,69 @@ libdata/bonobo/servers/GNOME_KeyboardApplet.server libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server libdata/bonobo/servers/GNOME_MiniCommanderApplet.server libdata/bonobo/servers/GNOME_MixerApplet.server -libdata/bonobo/servers/GNOME_ModemLightsApplet.server +libdata/bonobo/servers/GNOME_ModemLights.server libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +libdata/bonobo/servers/GNOME_NullApplet_Factory.server +libdata/bonobo/servers/GNOME_Panel_TrashApplet.server libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server libdata/bonobo/servers/GNOME_StickyNotesApplet.server libdata/pkgconfig/gswitchit.pc libexec/accessx-status-applet %%BATTERY%%libexec/battstat-applet-2 -libexec/cdplayer_applet2 libexec/charpick_applet2 +%%CPUFREQ%%libexec/cpufreq-applet libexec/drivemount_applet2 libexec/geyes_applet2 libexec/gnome-applets/mc-install-default-macros libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 -libexec/mailcheck-applet libexec/mini_commander_applet +libexec/modem_applet libexec/mixer_applet2 -libexec/modemlights_applet2 libexec/multiload-applet-2 +libexec/null_applet libexec/stickynotes_applet -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 -share/gnome/geyes/Bloodshot/Bloodshot-eye.png -share/gnome/geyes/Bloodshot/Bloodshot-pupil.png -share/gnome/geyes/Bloodshot/config -share/gnome/geyes/Default-tiny/Default-tiny-eye.png -share/gnome/geyes/Default-tiny/Default-tiny-pupil.png -share/gnome/geyes/Default-tiny/config -share/gnome/geyes/Default/Default-eye.png -share/gnome/geyes/Default/Default-pupil.png -share/gnome/geyes/Default/config -share/gnome/geyes/Horrid/config -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 -share/gnome/gkb/BG_Bulgarian.keyprop -share/gnome/gkb/BG_Bulgarian_x.keyprop -share/gnome/gkb/BR_Portuguese.keyprop -share/gnome/gkb/BR_Portuguese_x.keyprop -share/gnome/gkb/BY_Belarussian.keyprop -share/gnome/gkb/Basque.keyprop -share/gnome/gkb/Belgian.keyprop -share/gnome/gkb/BulgarianCyril.keyprop -share/gnome/gkb/CA_English.keyprop -share/gnome/gkb/CH_German_x.keyprop -share/gnome/gkb/CZ_Czech.keyprop -share/gnome/gkb/CZ_Czech_Slovak.keyprop -share/gnome/gkb/CZ_Czech_x.keyprop -share/gnome/gkb/DE_German.keyprop -share/gnome/gkb/DE_German_x.keyprop -share/gnome/gkb/DK_Danish.keyprop -share/gnome/gkb/DK_Danish_x.keyprop -share/gnome/gkb/Default.keyprop -share/gnome/gkb/Dvorak.keyprop -share/gnome/gkb/EE_Estonian.keyprop -share/gnome/gkb/EE_Estonian_x.keyprop -share/gnome/gkb/ES_Spanish-x86.keyprop -share/gnome/gkb/ES_Spanish.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-x86.keyprop -share/gnome/gkb/FR_French.keyprop -share/gnome/gkb/FR_French_x.keyprop -share/gnome/gkb/FrenchCanadian.keyprop -share/gnome/gkb/FrenchCanadian2.keyprop -share/gnome/gkb/FrenchSwiss.keyprop -share/gnome/gkb/GE_Georgian_x.keyprop -share/gnome/gkb/GR_Greek.keyprop -share/gnome/gkb/GR_Greek_x.keyprop -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 -share/gnome/gkb/IL_Hebrew.keyprop -share/gnome/gkb/IL_Hebrew_x.keyprop -share/gnome/gkb/IS_Icelandic.keyprop -share/gnome/gkb/IS_Icelandic_x.keyprop -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 -share/gnome/gkb/LT_Prog.keyprop -share/gnome/gkb/LT_Standard.keyprop -share/gnome/gkb/MK_Macedonian.keyprop -share/gnome/gkb/MN_Mongolian.keyprop -share/gnome/gkb/MN_Mongolian_x.keyprop -share/gnome/gkb/MN_Mongolian_x_rev.keyprop -share/gnome/gkb/MN_Mongolian_x_uni.keyprop -share/gnome/gkb/Macedonian.keyprop -share/gnome/gkb/NL_Dutch_x.keyprop -share/gnome/gkb/NO_Norwegian.keyprop -share/gnome/gkb/Norwegian.keyprop -share/gnome/gkb/PL_Polish.keyprop -share/gnome/gkb/PT_Portuguese.keyprop -share/gnome/gkb/PT_Portuguese_x.keyprop -share/gnome/gkb/Polish.keyprop -share/gnome/gkb/PolishDeadkeys.keyprop -share/gnome/gkb/Portugal.keyprop -share/gnome/gkb/PortugalDeadkeys.keyprop -share/gnome/gkb/RO_Romanian.keyprop -share/gnome/gkb/RU_Russian.keyprop -share/gnome/gkb/RU_Russian_x.keyprop -share/gnome/gkb/RU_Russian_x_rev.keyprop -share/gnome/gkb/RussianCyril.keyprop -share/gnome/gkb/SE_Swedish.keyprop -share/gnome/gkb/SE_Swedish_x.keyprop -share/gnome/gkb/SI_Slovenian.keyprop -share/gnome/gkb/SI_Slovenian_x.keyprop -share/gnome/gkb/SK__x.keyprop -share/gnome/gkb/SR_Dutch.keyprop -share/gnome/gkb/Slovak.keyprop -share/gnome/gkb/Slovene.keyprop -share/gnome/gkb/Slovenian.keyprop -share/gnome/gkb/Swedish.keyprop -share/gnome/gkb/Syriac.keyprop -share/gnome/gkb/Syriac_Phonetic.keyprop -share/gnome/gkb/TH_Thai.keyprop -share/gnome/gkb/TH_Thai_x.keyprop -share/gnome/gkb/TR-f.keyprop -share/gnome/gkb/TR-q.keyprop -share/gnome/gkb/TR_Turkish.keyprop -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-102.keyprop -share/gnome/gkb/UK-x86.keyprop -share/gnome/gkb/UK.keyprop -share/gnome/gkb/UK_English.keyprop -share/gnome/gkb/UK_English_x.keyprop -share/gnome/gkb/UK_United_Kingdom.keyprop -share/gnome/gkb/US-101.keyprop -share/gnome/gkb/US-101A-x86.keyprop -share/gnome/gkb/US-84.keyprop -share/gnome/gkb/US-dec.keyprop -share/gnome/gkb/US-ibm.keyprop -share/gnome/gkb/US-int.keyprop -share/gnome/gkb/US-mac.keyprop -share/gnome/gkb/US-sgi-101.keyprop -share/gnome/gkb/US-sun.keyprop -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_Serb_x.keyprop -share/gnome/gkb/YU_Serbo-Croatian_x.keyprop -share/gnome/gkb/Yugoslav.keyprop -share/gnome/gkb/presets.xml +libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.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 +%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml -share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml -share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml 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_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml -share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml -share/gnome/gswitchit/gswitchit-plugins.glade -share/gnome/gswitchit/gswitchit-properties.glade -share/gnome/gweather/Locations.xml +share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png +share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png +share/gnome/gnome-applets/geyes/Bizarre/config +share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png +share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png +share/gnome/gnome-applets/geyes/Bloodshot/config +share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png +share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png +share/gnome/gnome-applets/geyes/Default-tiny/config +share/gnome/gnome-applets/geyes/Default/Default-eye.png +share/gnome/gnome-applets/geyes/Default/Default-pupil.png +share/gnome/gnome-applets/geyes/Default/config +share/gnome/gnome-applets/geyes/Horrid/config +share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png +share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png +%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade +%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade +share/gnome/gnome-applets/glade/gswitchit-plugins.glade +share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/mini-commander.glade +share/gnome/gnome-applets/glade/modemlights.glade +share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/gweather/Locations.xml +share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png share/gnome/help/accessx-status/C/legal.xml @@ -216,6 +86,7 @@ share/gnome/help/accessx-status/eu/accessx-status.xml share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png share/gnome/help/accessx-status/eu/legal.xml %%BATTERY%%share/gnome/help/battstat/C/battstat.xml +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png %%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png %%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png %%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png @@ -352,154 +223,11 @@ share/gnome/help/accessx-status/eu/legal.xml %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png %%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml -share/gnome/help/cdplayer/C/cdplayer.xml -share/gnome/help/cdplayer/C/figures/cdplayer_applet.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/C/legal.xml -share/gnome/help/cdplayer/de/cdplayer.xml -share/gnome/help/cdplayer/de/figures/cdplayer_applet.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/de/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/de/legal.xml -share/gnome/help/cdplayer/es/cdplayer.xml -share/gnome/help/cdplayer/es/figures/cdplayer_applet.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/es/legal.xml -share/gnome/help/cdplayer/eu/cdplayer.xml -share/gnome/help/cdplayer/eu/figures/cdplayer_applet.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/eu/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/eu/legal.xml -share/gnome/help/cdplayer/fr/cdplayer.xml -share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/fr/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/fr/legal.xml -share/gnome/help/cdplayer/it/cdplayer.xml -share/gnome/help/cdplayer/it/figures/cdplayer_applet.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/it/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/it/legal.xml -share/gnome/help/cdplayer/ja/cdplayer.xml -share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/ja/legal.xml -share/gnome/help/cdplayer/ko/cdplayer.xml -share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/ko/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/ko/legal.xml -share/gnome/help/cdplayer/sv/cdplayer.xml -share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/sv/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/sv/legal.xml -share/gnome/help/cdplayer/zh_CN/cdplayer.xml -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_CN/legal.xml -share/gnome/help/cdplayer/zh_HK/cdplayer.xml -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_HK/legal.xml -share/gnome/help/cdplayer/zh_TW/cdplayer.xml -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png -share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png -share/gnome/help/cdplayer/zh_TW/legal.xml share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png share/gnome/help/char-palette/C/figures/charpick_characters.png +share/gnome/help/char-palette/C/figures/charpick-preferences.png share/gnome/help/char-palette/C/legal.xml share/gnome/help/char-palette/de/char-palette.xml share/gnome/help/char-palette/de/figures/charpalette_applet.png @@ -571,6 +299,8 @@ share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png share/gnome/help/char-palette/zh_TW/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/figures/prefs-macros.png +share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml share/gnome/help/command-line/de/command-line.xml share/gnome/help/command-line/de/figures/command-line.png @@ -605,12 +335,21 @@ share/gnome/help/command-line/zh_HK/legal.xml share/gnome/help/command-line/zh_TW/command-line.xml share/gnome/help/command-line/zh_TW/figures/command-line.png share/gnome/help/command-line/zh_TW/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml share/gnome/help/drivemount/C/drivemount.xml -share/gnome/help/drivemount/C/figures/drivemount-applet_window.png -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/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/C/figures/drivemount-applet_example.png +share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/C/figures/drivemount-applet_open.png +share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml share/gnome/help/drivemount/de/drivemount.xml share/gnome/help/drivemount/de/figures/drivemount-applet_window.png @@ -733,42 +472,6 @@ share/gnome/help/geyes/zh_TW/figures/geyes_applet.png share/gnome/help/geyes/zh_TW/figures/geyes_settings.png share/gnome/help/geyes/zh_TW/geyes.xml share/gnome/help/geyes/zh_TW/legal.xml -share/gnome/help/gkb/C/figures/gkb_applet.png -share/gnome/help/gkb/C/gkb.xml -share/gnome/help/gkb/C/legal.xml -share/gnome/help/gkb/de/figures/gkb_applet.png -share/gnome/help/gkb/de/gkb.xml -share/gnome/help/gkb/de/legal.xml -share/gnome/help/gkb/es/figures/gkb_applet.png -share/gnome/help/gkb/es/gkb.xml -share/gnome/help/gkb/es/legal.xml -share/gnome/help/gkb/eu/figures/gkb_applet.png -share/gnome/help/gkb/eu/gkb.xml -share/gnome/help/gkb/eu/legal.xml -share/gnome/help/gkb/fr/figures/gkb_applet.png -share/gnome/help/gkb/fr/gkb.xml -share/gnome/help/gkb/fr/legal.xml -share/gnome/help/gkb/it/figures/gkb_applet.png -share/gnome/help/gkb/it/gkb.xml -share/gnome/help/gkb/it/legal.xml -share/gnome/help/gkb/ja/figures/gkb_applet.png -share/gnome/help/gkb/ja/gkb.xml -share/gnome/help/gkb/ja/legal.xml -share/gnome/help/gkb/ko/figures/gkb_applet.png -share/gnome/help/gkb/ko/gkb.xml -share/gnome/help/gkb/ko/legal.xml -share/gnome/help/gkb/sv/figures/gkb_applet.png -share/gnome/help/gkb/sv/gkb.xml -share/gnome/help/gkb/sv/legal.xml -share/gnome/help/gkb/zh_CN/figures/gkb_applet.png -share/gnome/help/gkb/zh_CN/gkb.xml -share/gnome/help/gkb/zh_CN/legal.xml -share/gnome/help/gkb/zh_HK/figures/gkb_applet.png -share/gnome/help/gkb/zh_HK/gkb.xml -share/gnome/help/gkb/zh_HK/legal.xml -share/gnome/help/gkb/zh_TW/figures/gkb_applet.png -share/gnome/help/gkb/zh_TW/gkb.xml -share/gnome/help/gkb/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png @@ -808,8 +511,18 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml share/gnome/help/gtik2_applet2/zh_TW/legal.xml share/gnome/help/gweather/C/figures/gweather_applet.png -share/gnome/help/gweather/C/figures/gweather_settings.png -share/gnome/help/gweather/C/figures/gweather_weather.png +share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-prefs-general.png +share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/stock_weather-cloudy.png +share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/C/figures/stock_weather-fog.png +share/gnome/help/gweather/C/figures/stock_weather-night-clear.png +share/gnome/help/gweather/C/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/C/figures/stock_weather-showers.png +share/gnome/help/gweather/C/figures/stock_weather-snow.png +share/gnome/help/gweather/C/figures/stock_weather-storm.png +share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml share/gnome/help/gweather/de/figures/gweather_applet.png @@ -867,66 +580,6 @@ share/gnome/help/gweather/zh_TW/figures/gweather_settings.png share/gnome/help/gweather/zh_TW/figures/gweather_weather.png share/gnome/help/gweather/zh_TW/gweather.xml share/gnome/help/gweather/zh_TW/legal.xml -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/mailcheck/de/figures/mailcheck-applet.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/de/figures/mailcheck_applet.png -share/gnome/help/mailcheck/de/legal.xml -share/gnome/help/mailcheck/de/mailcheck.xml -share/gnome/help/mailcheck/es/figures/mailcheck-applet.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/es/figures/mailcheck_applet.png -share/gnome/help/mailcheck/es/legal.xml -share/gnome/help/mailcheck/es/mailcheck.xml -share/gnome/help/mailcheck/eu/figures/mailcheck_applet.png -share/gnome/help/mailcheck/eu/legal.xml -share/gnome/help/mailcheck/eu/mailcheck.xml -share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png -share/gnome/help/mailcheck/fr/legal.xml -share/gnome/help/mailcheck/fr/mailcheck.xml -share/gnome/help/mailcheck/it/figures/mailcheck-applet.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/it/figures/mailcheck_applet.png -share/gnome/help/mailcheck/it/legal.xml -share/gnome/help/mailcheck/it/mailcheck.xml -share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ja/legal.xml -share/gnome/help/mailcheck/ja/mailcheck.xml -share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png -share/gnome/help/mailcheck/ko/legal.xml -share/gnome/help/mailcheck/ko/mailcheck.xml -share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png -share/gnome/help/mailcheck/sv/legal.xml -share/gnome/help/mailcheck/sv/mailcheck.xml -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_CN/legal.xml -share/gnome/help/mailcheck/zh_CN/mailcheck.xml -share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_HK/legal.xml -share/gnome/help/mailcheck/zh_HK/mailcheck.xml -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png -share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png -share/gnome/help/mailcheck/zh_TW/legal.xml -share/gnome/help/mailcheck/zh_TW/mailcheck.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml @@ -972,49 +625,9 @@ share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/zh_TW/legal.xml share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml -share/gnome/help/modemlights/C/figures/modemlights-advanced.png -share/gnome/help/modemlights/C/figures/modemlights-advpref.png -share/gnome/help/modemlights/C/figures/modemlights-color.png -share/gnome/help/modemlights/C/figures/modemlights-general.png -share/gnome/help/modemlights/C/figures/modemlights-prefs.png -share/gnome/help/modemlights/C/figures/modemlights.png -share/gnome/help/modemlights/C/figures/modemlights_applet.png -share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png -share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png -share/gnome/help/modemlights/C/figures/modemlights_applet_button.png -share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png -share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png -share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png -share/gnome/help/modemlights/C/figures/modemlights_applet_general.png -share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png -share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png -share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png -share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png -share/gnome/help/modemlights/C/legal.xml -share/gnome/help/modemlights/C/modemlights.xml -share/gnome/help/modemlights/eu/figures/modemlights-advanced.png -share/gnome/help/modemlights/eu/figures/modemlights-advpref.png -share/gnome/help/modemlights/eu/figures/modemlights-color.png -share/gnome/help/modemlights/eu/figures/modemlights-general.png -share/gnome/help/modemlights/eu/figures/modemlights-prefs.png -share/gnome/help/modemlights/eu/figures/modemlights.png -share/gnome/help/modemlights/eu/figures/modemlights_applet.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_advanced.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_awaiting.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_button.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_button_2.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_colors.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_connected.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_general.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_if_connect.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_not_connected.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_connecting.png -share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_display.png -share/gnome/help/modemlights/eu/legal.xml -share/gnome/help/modemlights/eu/modemlights.xml +share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png -share/gnome/help/multiload/C/figures/system_monitor_prefs.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml share/gnome/help/multiload/de/figures/system-monitor-applet_window.png @@ -1053,6 +666,11 @@ share/gnome/help/multiload/zh_TW/legal.xml share/gnome/help/multiload/zh_TW/multiload.xml share/gnome/help/stickynotes_applet/C/legal.xml share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png +share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/de/legal.xml share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml @@ -1086,50 +704,9 @@ share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png share/gnome/help/stickynotes_applet/zh_TW/legal.xml share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/wireless/C/legal.xml -share/gnome/help/wireless/C/wireless.xml -share/gnome/help/wireless/de/figures/wireless_applet_conn.png -share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/de/legal.xml -share/gnome/help/wireless/de/wireless.xml -share/gnome/help/wireless/es/figures/wireless_applet_conn.png -share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/es/legal.xml -share/gnome/help/wireless/es/wireless.xml -share/gnome/help/wireless/eu/legal.xml -share/gnome/help/wireless/eu/wireless.xml -share/gnome/help/wireless/fr/figures/wireless_applet_conn.png -share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/fr/legal.xml -share/gnome/help/wireless/fr/wireless.xml -share/gnome/help/wireless/it/figures/wireless_applet_conn.png -share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/it/legal.xml -share/gnome/help/wireless/it/wireless.xml -share/gnome/help/wireless/ja/figures/wireless_applet_conn.png -share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/ja/legal.xml -share/gnome/help/wireless/ja/wireless.xml -share/gnome/help/wireless/ko/figures/wireless_applet_conn.png -share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/ko/legal.xml -share/gnome/help/wireless/ko/wireless.xml -share/gnome/help/wireless/sv/figures/wireless_applet_conn.png -share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/sv/legal.xml -share/gnome/help/wireless/sv/wireless.xml -share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_CN/legal.xml -share/gnome/help/wireless/zh_CN/wireless.xml -share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_HK/legal.xml -share/gnome/help/wireless/zh_HK/wireless.xml -share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png -share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png -share/gnome/help/wireless/zh_TW/legal.xml -share/gnome/help/wireless/zh_TW/wireless.xml +share/gnome/help/trashapplet/C/legal.xml +share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/trashapplet.xml share/gnome/omf/gnome-applets/accessx-status-C.omf share/gnome/omf/gnome-applets/accessx-status-eu.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf @@ -1144,18 +721,6 @@ share/gnome/omf/gnome-applets/accessx-status-eu.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/cdplayer-C.omf -share/gnome/omf/gnome-applets/cdplayer-de.omf -share/gnome/omf/gnome-applets/cdplayer-es.omf -share/gnome/omf/gnome-applets/cdplayer-eu.omf -share/gnome/omf/gnome-applets/cdplayer-fr.omf -share/gnome/omf/gnome-applets/cdplayer-it.omf -share/gnome/omf/gnome-applets/cdplayer-ja.omf -share/gnome/omf/gnome-applets/cdplayer-ko.omf -share/gnome/omf/gnome-applets/cdplayer-sv.omf -share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf -share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf -share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf share/gnome/omf/gnome-applets/char-palette-C.omf share/gnome/omf/gnome-applets/char-palette-de.omf share/gnome/omf/gnome-applets/char-palette-es.omf @@ -1180,6 +745,7 @@ share/gnome/omf/gnome-applets/command-line-sv.omf share/gnome/omf/gnome-applets/command-line-zh_CN.omf share/gnome/omf/gnome-applets/command-line-zh_HK.omf share/gnome/omf/gnome-applets/command-line-zh_TW.omf +%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf share/gnome/omf/gnome-applets/drivemount-C.omf share/gnome/omf/gnome-applets/drivemount-de.omf share/gnome/omf/gnome-applets/drivemount-es.omf @@ -1204,18 +770,6 @@ share/gnome/omf/gnome-applets/geyes-sv.omf share/gnome/omf/gnome-applets/geyes-zh_CN.omf share/gnome/omf/gnome-applets/geyes-zh_HK.omf share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gkb-C.omf -share/gnome/omf/gnome-applets/gkb-de.omf -share/gnome/omf/gnome-applets/gkb-es.omf -share/gnome/omf/gnome-applets/gkb-eu.omf -share/gnome/omf/gnome-applets/gkb-fr.omf -share/gnome/omf/gnome-applets/gkb-it.omf -share/gnome/omf/gnome-applets/gkb-ja.omf -share/gnome/omf/gnome-applets/gkb-ko.omf -share/gnome/omf/gnome-applets/gkb-sv.omf -share/gnome/omf/gnome-applets/gkb-zh_CN.omf -share/gnome/omf/gnome-applets/gkb-zh_HK.omf -share/gnome/omf/gnome-applets/gkb-zh_TW.omf share/gnome/omf/gnome-applets/gswitchit-C.omf share/gnome/omf/gnome-applets/gtik2_applet2-C.omf share/gnome/omf/gnome-applets/gtik2_applet2-de.omf @@ -1241,18 +795,6 @@ share/gnome/omf/gnome-applets/gweather-sv.omf share/gnome/omf/gnome-applets/gweather-zh_CN.omf share/gnome/omf/gnome-applets/gweather-zh_HK.omf share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mailcheck-C.omf -share/gnome/omf/gnome-applets/mailcheck-de.omf -share/gnome/omf/gnome-applets/mailcheck-es.omf -share/gnome/omf/gnome-applets/mailcheck-eu.omf -share/gnome/omf/gnome-applets/mailcheck-fr.omf -share/gnome/omf/gnome-applets/mailcheck-it.omf -share/gnome/omf/gnome-applets/mailcheck-ja.omf -share/gnome/omf/gnome-applets/mailcheck-ko.omf -share/gnome/omf/gnome-applets/mailcheck-sv.omf -share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf -share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf -share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf share/gnome/omf/gnome-applets/mixer_applet2-C.omf share/gnome/omf/gnome-applets/mixer_applet2-de.omf share/gnome/omf/gnome-applets/mixer_applet2-es.omf @@ -1265,8 +807,6 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/modemlights-C.omf -share/gnome/omf/gnome-applets/modemlights-eu.omf share/gnome/omf/gnome-applets/multiload-C.omf share/gnome/omf/gnome-applets/multiload-de.omf share/gnome/omf/gnome-applets/multiload-es.omf @@ -1291,18 +831,7 @@ share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/wireless-C.omf -share/gnome/omf/gnome-applets/wireless-de.omf -share/gnome/omf/gnome-applets/wireless-es.omf -share/gnome/omf/gnome-applets/wireless-eu.omf -share/gnome/omf/gnome-applets/wireless-fr.omf -share/gnome/omf/gnome-applets/wireless-it.omf -share/gnome/omf/gnome-applets/wireless-ja.omf -share/gnome/omf/gnome-applets/wireless-ko.omf -share/gnome/omf/gnome-applets/wireless-sv.omf -share/gnome/omf/gnome-applets/wireless-zh_CN.omf -share/gnome/omf/gnome-applets/wireless-zh_HK.omf -share/gnome/omf/gnome-applets/wireless-zh_TW.omf +share/gnome/omf/gnome-applets/trashapplet-C.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1339,104 +868,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png -%%BATTERY%%share/gnome/pixmaps/battstat.png -share/gnome/pixmaps/charpick.png -share/gnome/pixmaps/drivemount-applet.png -share/gnome/pixmaps/gkb-icon.png -share/gnome/pixmaps/gkb.png -share/gnome/pixmaps/gkb/ae.png -share/gnome/pixmaps/gkb/am.png -share/gnome/pixmaps/gkb/ar.png -share/gnome/pixmaps/gkb/at.png -share/gnome/pixmaps/gkb/az.png -share/gnome/pixmaps/gkb/be.png -share/gnome/pixmaps/gkb/bg.png -share/gnome/pixmaps/gkb/bh.png -share/gnome/pixmaps/gkb/br.png -share/gnome/pixmaps/gkb/by.png -share/gnome/pixmaps/gkb/ca.png -share/gnome/pixmaps/gkb/ch.png -share/gnome/pixmaps/gkb/cu.png -share/gnome/pixmaps/gkb/cz.png -share/gnome/pixmaps/gkb/de.png -share/gnome/pixmaps/gkb/dj.png -share/gnome/pixmaps/gkb/dk.png -share/gnome/pixmaps/gkb/dz.png -share/gnome/pixmaps/gkb/ee.png -share/gnome/pixmaps/gkb/eg.png -share/gnome/pixmaps/gkb/es.png -share/gnome/pixmaps/gkb/eu.png -share/gnome/pixmaps/gkb/fi.png -share/gnome/pixmaps/gkb/fr.png -share/gnome/pixmaps/gkb/ge.png -share/gnome/pixmaps/gkb/gkb.png -share/gnome/pixmaps/gkb/gr.png -share/gnome/pixmaps/gkb/hr.png -share/gnome/pixmaps/gkb/hu.png -share/gnome/pixmaps/gkb/il.png -share/gnome/pixmaps/gkb/iq.png -share/gnome/pixmaps/gkb/is.png -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/la.png -share/gnome/pixmaps/gkb/lam.png -share/gnome/pixmaps/gkb/lb.png -share/gnome/pixmaps/gkb/lt.png -share/gnome/pixmaps/gkb/ly.png -share/gnome/pixmaps/gkb/ma.png -share/gnome/pixmaps/gkb/mk.png -share/gnome/pixmaps/gkb/mn.png -share/gnome/pixmaps/gkb/mx.png -share/gnome/pixmaps/gkb/nl.png -share/gnome/pixmaps/gkb/no.png -share/gnome/pixmaps/gkb/om.png -share/gnome/pixmaps/gkb/pl.png -share/gnome/pixmaps/gkb/ps.png -share/gnome/pixmaps/gkb/pt.png -share/gnome/pixmaps/gkb/qa.png -share/gnome/pixmaps/gkb/qc.png -share/gnome/pixmaps/gkb/ro.png -share/gnome/pixmaps/gkb/ru.png -share/gnome/pixmaps/gkb/sa.png -share/gnome/pixmaps/gkb/sd.png -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/sy.png -share/gnome/pixmaps/gkb/th.png -share/gnome/pixmaps/gkb/tn.png -share/gnome/pixmaps/gkb/tr.png -share/gnome/pixmaps/gkb/ua.png -share/gnome/pixmaps/gkb/uk.png -share/gnome/pixmaps/gkb/un.png -share/gnome/pixmaps/gkb/us.png -share/gnome/pixmaps/gkb/uy.png -share/gnome/pixmaps/gkb/vn.png -share/gnome/pixmaps/gkb/ye.png -share/gnome/pixmaps/gkb/yu.png -share/gnome/pixmaps/gnome-cpu.png -share/gnome/pixmaps/gnome-eyes.png -share/gnome/pixmaps/gnome-mini-commander.png -share/gnome/pixmaps/gnome-mixer-applet.png -share/gnome/pixmaps/mailcheck/eclouds.png -share/gnome/pixmaps/mailcheck/email-e.png -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/mini-commander/browser-mini.xpm -share/gnome/pixmaps/mini-commander/history-mini.xpm -share/gnome/pixmaps/mixer/volume-max.png -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 +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png +%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png share/gnome/pixmaps/stickynotes/close.png share/gnome/pixmaps/stickynotes/locked.png share/gnome/pixmaps/stickynotes/resize_se.png @@ -1444,15 +881,7 @@ share/gnome/pixmaps/stickynotes/resize_sw.png share/gnome/pixmaps/stickynotes/stickynotes.png share/gnome/pixmaps/stickynotes/stickynotes_prelight.png share/gnome/pixmaps/stickynotes/unlocked.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/stickynotes/stickynotes.glade -share/gnome/wireless-applet/wireless-applet.glade +share/gnome/xmodmap/base.xml share/gnome/xmodmap/xmodmap.am share/gnome/xmodmap/xmodmap.ar share/gnome/xmodmap/xmodmap.be @@ -1538,6 +967,13 @@ share/gnome/xmodmap/xmodmap.us.old share/gnome/xmodmap/xmodmap.us101A_x86 share/gnome/xmodmap/xmodmap.us_intl share/gnome/xmodmap/xmodmap.yu +share/icons/hicolor/48x48/apps/ax-applet.png +share/icons/hicolor/48x48/apps/charpick.png +share/icons/hicolor/48x48/apps/gnome-cpu.png +share/icons/hicolor/48x48/apps/gnome-eyes.png +share/icons/hicolor/48x48/apps/gnome-mini-commander.png +share/icons/hicolor/48x48/apps/gnome-modem.png +share/icons/hicolor/48x48/apps/gnome-money.png share/icons/hicolor/48x48/apps/gswitchit-applet.png share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo @@ -1603,39 +1039,13 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo 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/wireless-applet -@dirrm share/gnome/stickynotes -@dirrm share/gnome/pixmaps/wireless-applet @dirrm share/gnome/pixmaps/stickynotes -@dirrm share/gnome/pixmaps/mixer -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/gkb +%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet @dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/wireless/zh_TW/figures -@dirrm share/gnome/help/wireless/zh_TW -@dirrm share/gnome/help/wireless/zh_HK/figures -@dirrm share/gnome/help/wireless/zh_HK -@dirrm share/gnome/help/wireless/zh_CN/figures -@dirrm share/gnome/help/wireless/zh_CN -@dirrm share/gnome/help/wireless/sv/figures -@dirrm share/gnome/help/wireless/sv -@dirrm share/gnome/help/wireless/ko/figures -@dirrm share/gnome/help/wireless/ko -@dirrm share/gnome/help/wireless/ja/figures -@dirrm share/gnome/help/wireless/ja -@dirrm share/gnome/help/wireless/it/figures -@dirrm share/gnome/help/wireless/it -@dirrm share/gnome/help/wireless/fr/figures -@dirrm share/gnome/help/wireless/fr -@dirrm share/gnome/help/wireless/eu -@dirrm share/gnome/help/wireless/es/figures -@dirrm share/gnome/help/wireless/es -@dirrm share/gnome/help/wireless/de/figures -@dirrm share/gnome/help/wireless/de -@dirrm share/gnome/help/wireless/C -@dirrm share/gnome/help/wireless +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/help/trashapplet @dirrm share/gnome/help/stickynotes_applet/zh_TW/figures @dirrm share/gnome/help/stickynotes_applet/zh_TW @dirrm share/gnome/help/stickynotes_applet/zh_HK/figures @@ -1658,6 +1068,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/stickynotes_applet/es @dirrm share/gnome/help/stickynotes_applet/de/figures @dirrm share/gnome/help/stickynotes_applet/de +@dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet @dirrm share/gnome/help/multiload/zh_TW/figures @@ -1685,11 +1096,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/modemlights/eu/figures -@dirrm share/gnome/help/modemlights/eu -@dirrm share/gnome/help/modemlights/C/figures -@dirrm share/gnome/help/modemlights/C -@dirrm share/gnome/help/modemlights @dirrm share/gnome/help/mixer_applet2/zh_TW/figures @dirrm share/gnome/help/mixer_applet2/zh_TW @dirrm share/gnome/help/mixer_applet2/zh_HK/figures @@ -1715,31 +1121,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/mailcheck/zh_TW/figures -@dirrm share/gnome/help/mailcheck/zh_TW -@dirrm share/gnome/help/mailcheck/zh_HK/figures -@dirrm share/gnome/help/mailcheck/zh_HK -@dirrm share/gnome/help/mailcheck/zh_CN/figures -@dirrm share/gnome/help/mailcheck/zh_CN -@dirrm share/gnome/help/mailcheck/sv/figures -@dirrm share/gnome/help/mailcheck/sv -@dirrm share/gnome/help/mailcheck/ko/figures -@dirrm share/gnome/help/mailcheck/ko -@dirrm share/gnome/help/mailcheck/ja/figures -@dirrm share/gnome/help/mailcheck/ja -@dirrm share/gnome/help/mailcheck/it/figures -@dirrm share/gnome/help/mailcheck/it -@dirrm share/gnome/help/mailcheck/fr/figures -@dirrm share/gnome/help/mailcheck/fr -@dirrm share/gnome/help/mailcheck/eu/figures -@dirrm share/gnome/help/mailcheck/eu -@dirrm share/gnome/help/mailcheck/es/figures -@dirrm share/gnome/help/mailcheck/es -@dirrm share/gnome/help/mailcheck/de/figures -@dirrm share/gnome/help/mailcheck/de -@dirrm share/gnome/help/mailcheck/C/figures -@dirrm share/gnome/help/mailcheck/C -@dirrm share/gnome/help/mailcheck @dirrm share/gnome/help/gweather/zh_TW/figures @dirrm share/gnome/help/gweather/zh_TW @dirrm share/gnome/help/gweather/zh_HK/figures @@ -1792,31 +1173,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/gtik2_applet2 @dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/gkb/zh_TW/figures -@dirrm share/gnome/help/gkb/zh_TW -@dirrm share/gnome/help/gkb/zh_HK/figures -@dirrm share/gnome/help/gkb/zh_HK -@dirrm share/gnome/help/gkb/zh_CN/figures -@dirrm share/gnome/help/gkb/zh_CN -@dirrm share/gnome/help/gkb/sv/figures -@dirrm share/gnome/help/gkb/sv -@dirrm share/gnome/help/gkb/ko/figures -@dirrm share/gnome/help/gkb/ko -@dirrm share/gnome/help/gkb/ja/figures -@dirrm share/gnome/help/gkb/ja -@dirrm share/gnome/help/gkb/it/figures -@dirrm share/gnome/help/gkb/it -@dirrm share/gnome/help/gkb/fr/figures -@dirrm share/gnome/help/gkb/fr -@dirrm share/gnome/help/gkb/eu/figures -@dirrm share/gnome/help/gkb/eu -@dirrm share/gnome/help/gkb/es/figures -@dirrm share/gnome/help/gkb/es -@dirrm share/gnome/help/gkb/de/figures -@dirrm share/gnome/help/gkb/de -@dirrm share/gnome/help/gkb/C/figures -@dirrm share/gnome/help/gkb/C -@dirrm share/gnome/help/gkb @dirrm share/gnome/help/geyes/zh_TW/figures @dirrm share/gnome/help/geyes/zh_TW @dirrm share/gnome/help/geyes/zh_HK/figures @@ -1867,6 +1223,9 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet @dirrm share/gnome/help/command-line/zh_TW/figures @dirrm share/gnome/help/command-line/zh_TW @dirrm share/gnome/help/command-line/zh_HK/figures @@ -1917,31 +1276,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -@dirrm share/gnome/help/cdplayer/zh_TW/figures -@dirrm share/gnome/help/cdplayer/zh_TW -@dirrm share/gnome/help/cdplayer/zh_HK/figures -@dirrm share/gnome/help/cdplayer/zh_HK -@dirrm share/gnome/help/cdplayer/zh_CN/figures -@dirrm share/gnome/help/cdplayer/zh_CN -@dirrm share/gnome/help/cdplayer/sv/figures -@dirrm share/gnome/help/cdplayer/sv -@dirrm share/gnome/help/cdplayer/ko/figures -@dirrm share/gnome/help/cdplayer/ko -@dirrm share/gnome/help/cdplayer/ja/figures -@dirrm share/gnome/help/cdplayer/ja -@dirrm share/gnome/help/cdplayer/it/figures -@dirrm share/gnome/help/cdplayer/it -@dirrm share/gnome/help/cdplayer/fr/figures -@dirrm share/gnome/help/cdplayer/fr -@dirrm share/gnome/help/cdplayer/eu/figures -@dirrm share/gnome/help/cdplayer/eu -@dirrm share/gnome/help/cdplayer/es/figures -@dirrm share/gnome/help/cdplayer/es -@dirrm share/gnome/help/cdplayer/de/figures -@dirrm share/gnome/help/cdplayer/de -@dirrm share/gnome/help/cdplayer/C/figures -@dirrm share/gnome/help/cdplayer/C -@dirrm share/gnome/help/cdplayer %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW %%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures @@ -1972,16 +1306,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo @dirrm share/gnome/help/accessx-status/C/figures @dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status -@dirrm share/gnome/gweather -@dirrm share/gnome/gswitchit -@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 share/gnome/gnome-applets/gweather +@dirrm share/gnome/gnome-applets/glade +@dirrm share/gnome/gnome-applets/geyes/Horrid +@dirrm share/gnome/gnome-applets/geyes/Default +@dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Bloodshot +@dirrm share/gnome/gnome-applets/geyes/Bizarre +@dirrm share/gnome/gnome-applets/geyes +@dirrm share/gnome/gnome-applets @dirrm libexec/gnome-applets @dirrm include/libgswitchit diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index dd0d8e759343..e9e4262d4141 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnomedesktop -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.8 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 5cddabf936c5..91296a8ac2b4 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.8.3.tar.bz2) = 607f8689f931336ad9a1f3f41d98a9c7 -SIZE (gnome2/gnome-desktop-2.8.3.tar.bz2) = 1142079 +MD5 (gnome2/gnome-desktop-2.10.0.tar.bz2) = 62edee01c309cb1b049ceaa801d415cc +SIZE (gnome2/gnome-desktop-2.10.0.tar.bz2) = 1102509 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index d1cb33594f24..77b705c7d400 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -4,8 +4,9 @@ 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.3 +lib/libgnome-desktop-2.so.4 libdata/pkgconfig/gnome-desktop-2.0.pc +share/gnome/applications/gnome-about.desktop share/gnome/gnome-about/gnome-64.gif share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png @@ -33,12 +34,10 @@ share/gnome/omf/gnome-desktop/gpl-C.omf share/gnome/omf/gnome-desktop/gpl-eu.omf share/gnome/omf/gnome-desktop/lgpl-C.omf share/gnome/omf/gnome-desktop/lgpl-eu.omf -share/gnome/pixmaps/advanced-directory.png share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png share/gnome/pixmaps/gnome-applets.png -share/gnome/pixmaps/gnome-applications.png share/gnome/pixmaps/gnome-background-image.png share/gnome/pixmaps/gnome-background-pattern.png share/gnome/pixmaps/gnome-background.png @@ -61,7 +60,6 @@ share/gnome/pixmaps/gnome-debian.png share/gnome/pixmaps/gnome-diskfree.png share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png -share/gnome/pixmaps/gnome-favorites.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-folder.png @@ -80,19 +78,13 @@ share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png share/gnome/pixmaps/gnome-logo-large.png -share/gnome/pixmaps/gnome-mailcheck.png share/gnome/pixmaps/gnome-mdi.png share/gnome/pixmaps/gnome-mnemonic.png -share/gnome/pixmaps/gnome-modem.png -share/gnome/pixmaps/gnome-money.png -share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-month.png share/gnome/pixmaps/gnome-mouse.png -share/gnome/pixmaps/gnome-networktool.png share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png share/gnome/pixmaps/gnome-qeye.png -share/gnome/pixmaps/gnome-session.png share/gnome/pixmaps/gnome-set-time.png share/gnome/pixmaps/gnome-spider.png share/gnome/pixmaps/gnome-squeak.png @@ -106,7 +98,6 @@ share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-tigert.png share/gnome/pixmaps/gnome-touristinfo.png share/gnome/pixmaps/gnome-user-interface.png -share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-week.png share/gnome/pixmaps/gnome-windows.png share/gnome/pixmaps/gnome-word.png @@ -114,21 +105,8 @@ share/gnome/pixmaps/gnome-workspace.png share/gnome/pixmaps/gnome-xterm.png share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm -share/gnome/pixmaps/launcher-program.png share/gnome/pixmaps/monitor.png share/gnome/pixmaps/vnterm.xpm -share/gnome/vfolders/Accessories.directory -share/gnome/vfolders/Applications.directory -share/gnome/vfolders/Development.directory -share/gnome/vfolders/Games.directory -share/gnome/vfolders/Graphics.directory -share/gnome/vfolders/Internet.directory -share/gnome/vfolders/Multimedia.directory -share/gnome/vfolders/Office.directory -share/gnome/vfolders/Other.directory -share/gnome/vfolders/Root.directory -share/gnome/vfolders/Settings.directory -share/gnome/vfolders/System.directory share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo @@ -200,17 +178,14 @@ 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 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/nso 2> /dev/null || true @dirrm share/gnome/omf/gnome-desktop @dirrm share/gnome/help/lgpl/eu @dirrm share/gnome/help/gpl/eu diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index d28b9bf69171..effa2a92467c 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -6,10 +6,11 @@ # PORTNAME= gnomepanel -PORTVERSION= 2.8.3 +PORTVERSION= 2.10.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.8 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -21,8 +22,8 @@ INSTALLS_OMF= yes INSTALLS_SHLIB= yes USE_X_PREFIX= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack gnomedesktop \ - libwnck +USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ + libwnck gnomemenus WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes @@ -33,7 +34,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gnome-panel.1 -GCONF_SCHEMAS= clock.schemas fish.schemas gnome-panel-screenshot.schemas \ +GCONF_SCHEMAS= clock.schemas fish.schemas \ panel-compatibility.schemas panel-general.schemas \ panel-global.schemas panel-object.schemas \ panel-toplevel.schemas window-list.schemas \ @@ -53,9 +54,9 @@ CONFIGURE_ARGS+=--enable-eds CONFIGURE_ARGS+=--disable-eds .endif +post-patch: .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) -post-patch: .for po in da.po it.po zh_CN.po zh_TW.po @${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po} .endfor diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index de09d47ea354..14d5d7ced6f6 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.8.3.tar.bz2) = d76a09c321e02c18e0fdecb86677550d -SIZE (gnome2/gnome-panel-2.8.3.tar.bz2) = 3103815 +MD5 (gnome2/gnome-panel-2.10.0.tar.bz2) = 398e95097aeb7b8be2b6b47a0f9affe0 +SIZE (gnome2/gnome-panel-2.10.0.tar.bz2) = 3085157 diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index 1c8d80f4a383..6f6a65805ea4 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -1,19 +1,18 @@ bin/gnome-desktop-item-edit bin/gnome-panel -bin/gnome-panel-screenshot bin/panel-test-applets -@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true +@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true etc/gconf/schemas/panel-default-setup.entries @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true -@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true +@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true include/panel-2.0/GNOME_Panel.h include/panel-2.0/panel-applet-enums.h include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.0 +lib/libpanel-applet-2.so.1 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -50,10 +49,6 @@ share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml -share/gnome/gnome-panel/glade/fish.glade -share/gnome/gnome-panel/glade/panel-test-applets.glade -share/gnome/gnome-panel/glade/window-list.glade -share/gnome/gnome-panel/glade/workspace-switcher.glade share/gnome/gnome-panelrc share/gnome/help/clock/C/clock.xml share/gnome/help/clock/C/figures/clock_applet.png @@ -79,6 +74,9 @@ share/gnome/help/clock/ko/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml +share/gnome/help/clock/uk/clock.xml +share/gnome/help/clock/uk/figures/clock_applet.png +share/gnome/help/clock/uk/legal.xml share/gnome/help/clock/zh_CN/clock.xml share/gnome/help/clock/zh_CN/figures/clock_applet.png share/gnome/help/clock/zh_CN/legal.xml @@ -115,6 +113,9 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml +share/gnome/help/fish-applet-2/uk/figures/fish_applet.png +share/gnome/help/fish-applet-2/uk/fish-applet-2.xml +share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -161,6 +162,10 @@ share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml +share/gnome/help/window-list/uk/figures/window_list_applet.png +share/gnome/help/window-list/uk/figures/window_list_group_applet.png +share/gnome/help/window-list/uk/legal.xml +share/gnome/help/window-list/uk/window-list.xml share/gnome/help/window-list/zh_CN/figures/window_list_applet.png share/gnome/help/window-list/zh_CN/figures/window_list_group.png share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png @@ -201,6 +206,9 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml share/gnome/help/workspace-switcher/sv/workspace-switcher.xml +share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/uk/legal.xml +share/gnome/help/workspace-switcher/uk/workspace-switcher.xml share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_CN/legal.xml @@ -218,6 +226,7 @@ share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf +share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf share/gnome/omf/gnome-panel/fish-applet-2-C.omf @@ -228,6 +237,7 @@ share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf +share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf share/gnome/omf/gnome-panel/window-list-C.omf @@ -238,6 +248,7 @@ share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf +share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf share/gnome/omf/gnome-panel/workspace-switcher-C.omf @@ -248,33 +259,25 @@ share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf +share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf -share/gnome/panel/gnome-panel-screenshot.glade -share/gnome/panel/panel-properties-dialog.glade -share/gnome/panel/panel-run-dialog.glade -share/gnome/pixmaps/cdeappmenu.png -share/gnome/pixmaps/fish/fishanim.png -share/gnome/pixmaps/fish/footguy.png -share/gnome/pixmaps/fish/monkey.png -share/gnome/pixmaps/fish/oldwanda.png -share/gnome/pixmaps/gnome-amusements.png -share/gnome/pixmaps/gnome-clock.png -share/gnome/pixmaps/gnome-fish.png -share/gnome/pixmaps/gnome-gegl.png -share/gnome/pixmaps/gnome-gegl2-2.png -share/gnome/pixmaps/gnome-gegl2.png -share/gnome/pixmaps/gnome-main-menu.png -share/gnome/pixmaps/gnome-panel-type-corner.png -share/gnome/pixmaps/gnome-panel-type-edge.png -share/gnome/pixmaps/gnome-panel-type-floating.png -share/gnome/pixmaps/gnome-panel-type-menu.png -share/gnome/pixmaps/gnome-panel-type-sliding.png -share/gnome/pixmaps/gnome-panel.png -share/gnome/pixmaps/gnome-run.png -share/gnome/pixmaps/gnome-screenshot.png -share/gnome/pixmaps/panel-drawer.png -share/gnome/pixmaps/panel-force-quit.png +share/gnome/panel/glade/fish.glade +share/gnome/panel/glade/panel-properties-dialog.glade +share/gnome/panel/glade/panel-run-dialog.glade +share/gnome/panel/glade/panel-test-applets.glade +share/gnome/panel/glade/window-list.glade +share/gnome/panel/glade/workspace-switcher.glade +share/gnome/panel/pixmaps/fishanim.png +share/gnome/panel/pixmaps/footguy.png +share/gnome/panel/pixmaps/gnome-gegl2-2.png +share/gnome/panel/pixmaps/gnome-gegl2.png +share/gnome/panel/pixmaps/monkey.png +share/gnome/panel/pixmaps/oldwanda.png +share/icons/hicolor/48x48/apps/gnome-fish.png +share/icons/hicolor/48x48/apps/gnome-gegl.png +share/icons/hicolor/48x48/apps/gnome-main-menu.png +share/icons/hicolor/48x48/apps/panel-force-quit.png share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo @@ -319,6 +322,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo @@ -347,13 +351,28 @@ share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo -@dirrm share/gnome/pixmaps/fish +@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true +@dirrm share/gnome/panel/pixmaps +@dirrm share/gnome/panel/glade @dirrm share/gnome/omf/gnome-panel @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @dirrm share/gnome/help/workspace-switcher/zh_CN/figures @dirrm share/gnome/help/workspace-switcher/zh_CN +@dirrm share/gnome/help/workspace-switcher/uk/figures +@dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv @dirrm share/gnome/help/workspace-switcher/ko/figures @@ -375,6 +394,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/window-list/zh_TW @dirrm share/gnome/help/window-list/zh_CN/figures @dirrm share/gnome/help/window-list/zh_CN +@dirrm share/gnome/help/window-list/uk/figures +@dirrm share/gnome/help/window-list/uk @dirrm share/gnome/help/window-list/sv/figures @dirrm share/gnome/help/window-list/sv @dirrm share/gnome/help/window-list/ko/figures @@ -396,6 +417,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN +@dirrm share/gnome/help/fish-applet-2/uk/figures +@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @@ -417,6 +440,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @dirrm share/gnome/help/clock/zh_CN +@dirrm share/gnome/help/clock/uk/figures +@dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv @dirrm share/gnome/help/clock/ko/figures @@ -434,7 +459,5 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/C/figures @dirrm share/gnome/help/clock/C @dirrm share/gnome/help/clock -@dirrm share/gnome/gnome-panel/glade -@dirrm share/gnome/gnome-panel @dirrm share/doc/panel-applet @dirrm include/panel-2.0 diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 37f82afac725..1f48df2e0f83 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -6,17 +6,16 @@ # PORTNAME= gnomesession -PORTVERSION= 2.8.1 -PORTREVISION= 1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ - http://people.FreeBSD.org/~marcus/:local \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= sources/gnome-session/2.8 \ - marcus/:local + ${MASTER_SITE_LOCAL:S/$/:local/} \ + http://people.FreeBSD.org/~pav/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ + pav/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - ${SPLASH_IMG}:local + ${SPLASHES}:local DIST_SUBDIR= gnome2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -25,11 +24,9 @@ COMMENT= Session component for the GNOME 2 desktop USE_BZIP2= yes USE_X_PREFIX= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes USE_LIBTOOL_VER=15 -CONFIGURE_ARGS= --with-halt-command=/sbin/shutdown \ - --with-reboot-command=/sbin/shutdown CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" @@ -38,13 +35,19 @@ MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASH_IMG= gnome-splash28.png +SPLASHES= freebsd-splashes-gnome-2.10.tar post-extract: - @${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR} + cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} post-install: - ${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \ + ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ + ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png +.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ + ${PREFIX}/share/gnome/pixmaps/splash +.endfor .include <bsd.port.mk> diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 8f05e97ece4c..5f305e45c84f 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98 -SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921 -MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55 -SIZE (gnome2/gnome-splash28.png) = 121715 +MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff +SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 +MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 +SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in index 2b05e8c0027e..ed0b6ac56866 100644 --- a/x11/gnomesession/files/patch-gnome-session_Makefile.in +++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in @@ -1,11 +1,11 @@ ---- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004 -+++ gnome-session/Makefile.in Mon May 31 14:34:57 2004 -@@ -153,7 +153,7 @@ - +--- gnome-session/Makefile.in.orig Tue Nov 30 14:07:39 2004 ++++ gnome-session/Makefile.in Tue Nov 30 14:07:51 2004 +@@ -209,7 +209,7 @@ + target_alias = @target_alias@ NULL = -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) - INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" - + INCLUDES = \ + $(GNOME_SESSION_CFLAGS) \ diff --git a/x11/gnomesession/files/patch-gnome-session_logout.c b/x11/gnomesession/files/patch-gnome-session_logout.c deleted file mode 100644 index f82aefdc7d2e..000000000000 --- a/x11/gnomesession/files/patch-gnome-session_logout.c +++ /dev/null @@ -1,36 +0,0 @@ ---- gnome-session/logout.c.orig Sun May 9 15:45:34 2004 -+++ gnome-session/logout.c Sun May 9 15:48:29 2004 -@@ -37,12 +37,20 @@ - - static gchar *halt_command[] = - { -+#ifdef __FreeBSD__ -+ HALT_COMMAND, "-p", "now", NULL -+#else - HALT_COMMAND, NULL -+#endif - }; - - static gchar *reboot_command[] = - { -+#ifdef __FreeBSD__ -+ REBOOT_COMMAND, "-r", "now", NULL -+#else - REBOOT_COMMAND, NULL -+#endif - }; - - /* What action to take upon shutdown */ -@@ -401,8 +409,12 @@ - */ - s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL); - t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL); -+#ifndef __FreeBSD__ - if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) && - access (halt_command[0], X_OK) == 0) -+#else -+ if (access (halt_command[0], X_OK) == 0) -+#endif - { - GtkWidget *title, *spacer; - GtkWidget *action_vbox, *hbox; diff --git a/x11/gnomesession/files/patch-gnome-session_manager.c b/x11/gnomesession/files/patch-gnome-session_manager.c deleted file mode 100644 index 7e56843ac733..000000000000 --- a/x11/gnomesession/files/patch-gnome-session_manager.c +++ /dev/null @@ -1,14 +0,0 @@ ---- gnome-session/manager.c.orig Tue Oct 12 14:04:26 2004 -+++ gnome-session/manager.c Tue Oct 12 14:05:51 2004 -@@ -1042,9 +1042,10 @@ - - if (interact_ping_replied) - { -+ IceConn ice_conn; - gsm_verbose ("have interact_list; sending ping with data to client %p\n", client); - print_client (client); -- IceConn ice_conn = SmsGetIceConnection (client->connection); -+ ice_conn = SmsGetIceConnection (client->connection); - interact_ping_replied = FALSE; - IcePing (ice_conn, interact_ping_reply, (IcePointer)client); - } diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 6107618a5527..999c30043083 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -4,10 +4,17 @@ bin/gnome-session-remove bin/gnome-session-save bin/gnome-smproxy bin/gnome-wm -share/gnome/control-center-2.0/capplets/session-properties.desktop +share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm +share/gnome/pixmaps/splash/adamw.png +share/gnome/pixmaps/splash/banana_flex.png +share/gnome/pixmaps/splash/franco_malatacca.jpg +share/gnome/pixmaps/splash/franz_klammer-1.png +share/gnome/pixmaps/splash/franz_klammer-3.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/original-gnome-splash.png +share/gnome/pixmaps/splash/radek.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -57,6 +64,7 @@ share/locale/ne/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 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo +share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo @@ -76,5 +84,7 @@ share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo +share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index f01b7bd6507b..61b4256f05e8 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -6,10 +6,10 @@ # PORTNAME= gnometerminal -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.8 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -17,11 +17,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Terminal component for the GNOME 2 Desktop USE_BZIP2= yes -USE_X_PREFIX= yes INSTALLS_OMF= yes +USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomehier libgnomeui vte +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index ca84bcc12c2b..bb6a1fa2132f 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.8.2.tar.bz2) = ffa668b7301dff6ce5ad9ec4c1e11c92 -SIZE (gnome2/gnome-terminal-2.8.2.tar.bz2) = 2171397 +MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 +SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c deleted file mode 100644 index aafbb3a44ce0..000000000000 --- a/x11/gnometerminal/files/patch-src::terminal-screen.c +++ /dev/null @@ -1,24 +0,0 @@ ---- src/terminal-screen.c.orig Thu Nov 18 12:45:11 2004 -+++ src/terminal-screen.c Thu Nov 18 12:46:31 2004 -@@ -246,16 +246,16 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" - - terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); - - terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); - - terminal_widget_match_add (screen->priv->term, - -- "\\<(mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); - - terminal_screen_setup_dnd (screen); - diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index ca1a70673fac..22d4a5870a1e 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -48,6 +48,10 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/sv/figures/terminal_window.png share/gnome/help/gnome-terminal/sv/gnome-terminal.xml share/gnome/help/gnome-terminal/sv/legal.xml +share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png +share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png +share/gnome/help/gnome-terminal/uk/gnome-terminal.xml +share/gnome/help/gnome-terminal/uk/legal.xml share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png @@ -67,6 +71,7 @@ share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf +share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf share/gnome/pixmaps/gnome-terminal.png @@ -109,6 +114,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo share/locale/mn/LC_MESSAGES/gnome-terminal.mo share/locale/ms/LC_MESSAGES/gnome-terminal.mo share/locale/nb/LC_MESSAGES/gnome-terminal.mo +share/locale/ne/LC_MESSAGES/gnome-terminal.mo share/locale/nl/LC_MESSAGES/gnome-terminal.mo share/locale/nn/LC_MESSAGES/gnome-terminal.mo share/locale/no/LC_MESSAGES/gnome-terminal.mo @@ -137,6 +143,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/help/gnome-terminal/zh_TW @dirrm share/gnome/help/gnome-terminal/zh_CN/figures @dirrm share/gnome/help/gnome-terminal/zh_CN +@dirrm share/gnome/help/gnome-terminal/uk/figures +@dirrm share/gnome/help/gnome-terminal/uk @dirrm share/gnome/help/gnome-terminal/sv/figures @dirrm share/gnome/help/gnome-terminal/sv @dirrm share/gnome/help/gnome-terminal/ro/figures diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index e3ffc9118ca1..64e07c6fa498 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,10 +6,10 @@ # PORTNAME= libgnome -PORTVERSION= 2.8.1 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_XPM= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack gnomehier intlhack esound \ +USE_GNOME= gnomeprefix gnomehack intlhack esound \ gnomevfs2 libxslt USE_BISON= yes INSTALLS_SHLIB= yes @@ -47,8 +47,6 @@ GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \ desktop_gnome_typing_break.schemas -.include <bsd.port.pre.mk> - post-patch: @${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} @@ -57,4 +55,4 @@ post-patch: ${WRKSRC}/Makefile.in .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index f102c8bb2600..c21b936b02c0 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnome-2.8.1.tar.bz2) = 17577198f5086c48f69c361be2f4806c -SIZE (gnome2/libgnome-2.8.1.tar.bz2) = 1178438 +MD5 (gnome2/libgnome-2.10.0.tar.bz2) = f8e1225d96126f5139232821a6723d15 +SIZE (gnome2/libgnome-2.10.0.tar.bz2) = 871282 diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c index 8485c2aa7660..9dd33f9c2838 100644 --- a/x11/libgnome/files/patch-libgnome_gnome-program.c +++ b/x11/libgnome/files/patch-libgnome_gnome-program.c @@ -1,5 +1,5 @@ ---- libgnome/gnome-program.c.orig Mon Feb 21 07:39:01 2005 -+++ libgnome/gnome-program.c Mon Feb 21 23:35:17 2005 +--- libgnome/gnome-program.c.orig Mon May 31 16:37:02 2004 ++++ libgnome/gnome-program.c Mon May 31 16:37:05 2004 @@ -895,17 +895,17 @@ attr_rel = ""; break; @@ -68,12 +68,3 @@ search_path = FALSE; break; -@@ -1928,7 +1928,7 @@ - int argc, char **argv, - guint nparams, GParameter *params) - { -- va_list args = 0; -+ va_list args; - - return gnome_program_init_common (type, app_id, app_version, module_info, - argc, argv, NULL, args, nparams, params); diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index a79ee22d3ec2..6a186eaadcac 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -19,34 +19,35 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h lib/bonobo/monikers/libmoniker_extra_2.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.800 +lib/libgnome-2.so.1000 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc -share/doc/libgnome/ch01s02.html -share/doc/libgnome/ch01s03.html -share/doc/libgnome/ch01s04.html -share/doc/libgnome/ch01s05.html -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 -share/doc/libgnome/libgnome-gnome-help.html -share/doc/libgnome/libgnome-gnome-i18n.html -share/doc/libgnome/libgnome-gnome-init.html -share/doc/libgnome/libgnome-gnome-program.html -share/doc/libgnome/libgnome-gnome-score.html -share/doc/libgnome/libgnome-gnome-sound.html -share/doc/libgnome/libgnome-gnome-triggers.html -share/doc/libgnome/libgnome-gnome-url.html -share/doc/libgnome/libgnome-gnome-util.html -share/doc/libgnome/libgnome-libgnometypebuiltins.html -share/doc/libgnome/libgnome.devhelp -share/doc/libgnome/libgnome.html -share/doc/libgnome/right.png -share/doc/libgnome/up.png +%%DOCSDIR%%/ch01s02.html +%%DOCSDIR%%/ch01s03.html +%%DOCSDIR%%/ch01s04.html +%%DOCSDIR%%/ch01s05.html +%%DOCSDIR%%/home.png +%%DOCSDIR%%/index.html +%%DOCSDIR%%/index.sgml +%%DOCSDIR%%/left.png +%%DOCSDIR%%/libgnome-gnome-config.html +%%DOCSDIR%%/libgnome-gnome-exec.html +%%DOCSDIR%%/libgnome-gnome-gconf.html +%%DOCSDIR%%/libgnome-gnome-help.html +%%DOCSDIR%%/libgnome-gnome-i18n.html +%%DOCSDIR%%/libgnome-gnome-init.html +%%DOCSDIR%%/libgnome-gnome-program.html +%%DOCSDIR%%/libgnome-gnome-score.html +%%DOCSDIR%%/libgnome-gnome-sound.html +%%DOCSDIR%%/libgnome-gnome-triggers.html +%%DOCSDIR%%/libgnome-gnome-url.html +%%DOCSDIR%%/libgnome-gnome-util.html +%%DOCSDIR%%/libgnome-libgnometypebuiltins.html +%%DOCSDIR%%/libgnome.devhelp +%%DOCSDIR%%/libgnome.html +%%DOCSDIR%%/right.png +%%DOCSDIR%%/style.css +%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnome-2.0.mo share/locale/ar/LC_MESSAGES/libgnome-2.0.mo share/locale/az/LC_MESSAGES/libgnome-2.0.mo @@ -110,9 +111,10 @@ share/locale/tr/LC_MESSAGES/libgnome-2.0.mo share/locale/uk/LC_MESSAGES/libgnome-2.0.mo share/locale/vi/LC_MESSAGES/libgnome-2.0.mo share/locale/wa/LC_MESSAGES/libgnome-2.0.mo +share/locale/xh/LC_MESSAGES/libgnome-2.0.mo share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo -@dirrm share/doc/libgnome @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 +@dirrm %%DOCSDIR%% diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index d00571d57dd5..3ec757055fd6 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -6,8 +6,8 @@ # PORTNAME= libxklavier -PORTVERSION= 1.04 -PORTREVISION= 1 +PORTVERSION= 2.0 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -20,10 +20,12 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_GNOME= gnometarget gnomehack libxml2 INSTALLS_SHLIB= yes +USE_GETOPT_LONG=yes USE_LIBTOOL_VER=15 +CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CONFIGURE_ARGS= --disable-doxygen \ --with-xkb-base=${X11BASE}/lib/X11/xkb -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" PLIST_SUB= VERSION=${PORTVERSION} diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo index 12b8565f2e87..3236c8a12b54 100644 --- a/x11/libxklavier/distinfo +++ b/x11/libxklavier/distinfo @@ -1,2 +1,2 @@ -MD5 (libxklavier-1.04.tar.gz) = 322078ad3681465f69a65c0758c74460 -SIZE (libxklavier-1.04.tar.gz) = 422337 +MD5 (libxklavier-2.0.tar.gz) = 9257653ee3d194d9c8d669e969fe4332 +SIZE (libxklavier-2.0.tar.gz) = 435898 diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure new file mode 100644 index 000000000000..4de85e18100f --- /dev/null +++ b/x11/libxklavier/files/patch-configure @@ -0,0 +1,33 @@ +--- configure.orig Mon Dec 13 00:57:33 2004 ++++ configure Mon Dec 13 00:58:14 2004 +@@ -20135,9 +20135,9 @@ + + echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5 + echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6 +-if test \( "$enable_xkb_support" == "yes" -a \ +- "$xkb_headers_present" == "yes" \) -o \ +- "$enable_xmm_support" == "yes" ; then ++if test \( "$enable_xkb_support" = "yes" -a \ ++ "$xkb_headers_present" = "yes" \) -o \ ++ "$enable_xmm_support" = "yes" ; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +@@ -21744,14 +21744,14 @@ + + echo '**********************************************************' + echo ' Libxklavier is configured with the following backends:' +-if test "$enable_xkb_support" == "yes" ; then +- if test "$xkb_headers_present" == "yes" ; then ++if test "$enable_xkb_support" = "yes" ; then ++ if test "$xkb_headers_present" = "yes" ; then + echo ' XKB (libxkbfile headers are present)' + else + echo ' XKB (but libxkbfile headers are NOT present)' + fi + fi +-if test "$enable_xmm_support" == "yes" ; then ++if test "$enable_xmm_support" = "yes" ; then + echo ' xmodmap' + fi + echo '**********************************************************' diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c deleted file mode 100644 index fed33a78f971..000000000000 --- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c +++ /dev/null @@ -1,18 +0,0 @@ ---- libxklavier/xklavier_config_i18n.c.orig Mon Oct 25 21:55:29 2004 -+++ libxklavier/xklavier_config_i18n.c Mon Oct 25 21:56:51 2004 -@@ -142,13 +142,14 @@ - XklDebug( 0, - "Unable to convert %s from UTF-8 to %s, this string will probably display wrong.", - utf8string, charset ); -+ iconv_close( converter ); - return strdup( utf8string ); - } - *convertedStart = '\0'; - - iconv_close( converter ); - -- return converted; -+ return strdup( converted ); - } - - /* diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c deleted file mode 100644 index 946d2d5808b9..000000000000 --- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c +++ /dev/null @@ -1,15 +0,0 @@ ---- libxklavier/xklavier_config_xkb.c.orig Fri Oct 1 22:04:54 2004 -+++ libxklavier/xklavier_config_xkb.c Tue Oct 12 18:44:59 2004 -@@ -184,10 +184,11 @@ - - if ( supportState == UNCHECKED ) - { -+ XkbRF_RulesPtr rulesPtr; - XklDebug( 100, "!!! Checking multiple layouts support\n" ); - supportState = NON_SUPPORTED; - #ifdef XKB_HEADERS_PRESENT -- XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet(); -+ rulesPtr = _XklLoadRulesSet(); - if ( rulesPtr ) - { - XkbRF_VarDefsRec varDefs; diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c new file mode 100644 index 000000000000..195b48534da1 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c @@ -0,0 +1,23 @@ +--- libxklavier/xklavier.c.orig Tue Nov 2 16:58:48 2004 ++++ libxklavier/xklavier.c Tue Nov 23 19:56:29 2004 +@@ -536,7 +536,7 @@ + int level, const char format[], va_list args ) + { + time_t now = time( NULL ); +- fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function ); ++ fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function ); + vfprintf( stdout, format, args ); + } + +@@ -700,9 +700,10 @@ + { + if ( xklVTable == NULL ) + { ++ char *p; + XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" ); + /* force the crash! */ +- char *p = NULL; *p = '\0'; ++ p = NULL; *p = '\0'; + } + } + diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c new file mode 100644 index 000000000000..0ef120607f55 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c @@ -0,0 +1,11 @@ +--- libxklavier/xklavier_config_i18n.c.orig Tue Nov 23 18:33:37 2004 ++++ libxklavier/xklavier_config_i18n.c Tue Nov 23 18:34:30 2004 +@@ -106,7 +106,7 @@ + iconv_t converter; + static char converted[XKL_MAX_CI_DESC_LENGTH]; + char *convertedStart = converted; +- char *utfStart = ( char * ) utf8string; ++ const char *utfStart = ( const char * ) utf8string; + size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; + const char *charset; + diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c new file mode 100644 index 000000000000..8dbfe37c7977 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c @@ -0,0 +1,22 @@ +--- libxklavier/xklavier_evt_xmm.c.orig Tue Nov 30 02:18:31 2004 ++++ libxklavier/xklavier_evt_xmm.c Tue Nov 30 02:20:24 2004 +@@ -13,15 +13,15 @@ + { + if( _xklListenerType & XKLL_MANAGE_LAYOUTS ) + { +- XklDebug( 200, "Processing the KeyPress event\n" ); + int currentShortcut = 0; + const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, +- kpe->state, +- ¤tShortcut ); ++ kpe->state, ++ ¤tShortcut ); ++ XklDebug( 200, "Processing the KeyPress event\n" ); + if( sop != NULL ) + { +- XklDebug( 150, "It is THE shortcut\n" ); + XklState state; ++ XklDebug( 150, "It is THE shortcut\n" ); + _XklXmmGetRealState( &state ); + if( state.group != -1 ) + { diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c new file mode 100644 index 000000000000..6db8c55088c3 --- /dev/null +++ b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c @@ -0,0 +1,15 @@ +--- libxklavier/xklavier_xmm.c.orig Tue Nov 30 02:17:37 2004 ++++ libxklavier/xklavier_xmm.c Tue Nov 30 02:17:51 2004 +@@ -66,10 +66,11 @@ + const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut() + { + const char* optionName = _XklXmmGetCurrentShortcutOptionName(); ++ XmmSwitchOptionPtr switchOption; + XklDebug( 150, "Configured switch option: [%s]\n", optionName ); + if( optionName == NULL ) + return NULL; +- XmmSwitchOptionPtr switchOption = allSwitchOptions; ++ switchOption = allSwitchOptions; + while( switchOption->optionName != NULL ) + { + if( !strcmp( switchOption->optionName, optionName ) ) diff --git a/x11/libxklavier/files/patch-tests-test_config.c b/x11/libxklavier/files/patch-tests-test_config.c deleted file mode 100644 index cc374f0b96d2..000000000000 --- a/x11/libxklavier/files/patch-tests-test_config.c +++ /dev/null @@ -1,19 +0,0 @@ ---- tests/test_config.c.orig Fri Oct 1 21:52:02 2004 -+++ tests/test_config.c Tue Oct 12 18:46:32 2004 -@@ -46,6 +46,7 @@ - const char* layouts = NULL; - const char* options = NULL; - int debugLevel = 0; -+ Display* dpy; - - while (1) - { -@@ -89,7 +90,7 @@ - exit( 0 ); - } - -- Display* dpy = XOpenDisplay( NULL ); -+ dpy = XOpenDisplay( NULL ); - if ( dpy == NULL ) - { - fprintf( stderr, "Could not open display\n" ); diff --git a/x11/libxklavier/files/patch-tests-test_monitor.c b/x11/libxklavier/files/patch-tests-test_monitor.c deleted file mode 100644 index 3fcc08426904..000000000000 --- a/x11/libxklavier/files/patch-tests-test_monitor.c +++ /dev/null @@ -1,19 +0,0 @@ ---- tests/test_monitor.c.orig Fri Oct 1 21:52:02 2004 -+++ tests/test_monitor.c Tue Oct 12 18:47:32 2004 -@@ -42,6 +42,7 @@ - int c; - int debugLevel = 0; - XkbEvent ev; -+ Display* dpy; - - while (1) - { -@@ -63,7 +64,7 @@ - } - } - -- Display* dpy = XOpenDisplay( NULL ); -+ dpy = XOpenDisplay( NULL ); - if ( dpy == NULL ) - { - fprintf( stderr, "Could not open display\n" ); diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist index d58809c9513d..0a50a33fefdd 100644 --- a/x11/libxklavier/pkg-plist +++ b/x11/libxklavier/pkg-plist @@ -2,8 +2,8 @@ include/libxklavier/xklavier.h include/libxklavier/xklavier_config.h lib/libxklavier.a lib/libxklavier.so -lib/libxklavier.so.8 +lib/libxklavier.so.10 libdata/pkgconfig/libxklavier.pc -share/libxklavier/xfree86.xml -@dirrm share/libxklavier +%%DATADIR%%/xfree86.xml +@dirrm %%DATADIR%% @dirrm include/libxklavier diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 06d274d2aac8..880ac2eed127 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -6,23 +6,95 @@ # PORTNAME= yelp -PORTVERSION= 2.6.5 +PORTVERSION= 2.9.3 +PORTREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.9 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ + ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ + ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} + +MOZILLA= mozilla +HEADERS_SUFX= + +.if !defined(WITH_MOZILLA) +MOZILLA= mozilla +HEADERS_SUFX= +.else +.if ${WITH_MOZILLA}=="firefox" +MOZILLA= firefox +.else +.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" +MOZILLA= mozilla-devel +HEADERS_SUFX= -devel +.else +MOZILLA= mozilla +HEADERS_SUFX= +.endif +.endif +.endif + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libgtkhtml +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS= --enable-man \ + --enable-info \ + --with-mozilla=${MOZILLA} MAKE_ENV= G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias" -.include <bsd.port.mk> +GCONF_SCHEMAS= yelp.schemas + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +.if ${MOZILLA}=="mozilla-devel" +USE_GCC= 3.4 +.endif +.endif + +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can" + @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" + @${ECHO_MSG} + @${ECHO_MSG} " mozilla-devel " + @${ECHO_MSG} " firefox " + @${ECHO_MSG} "" + +post-patch: +.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel" + @${REINPLACE_CMD} -e 's|xmozilla|xmozilla-devel|g; \ + s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \ + s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \ + ${WRKSRC}/configure +.endif + +post-configure: + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%X11BASE%%|${X11BASE}|g ; \ + s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/yelp.sh \ + > ${WRKDIR}/yelp.sh + @${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%X11BASE%%|${X11BASE}|g ; \ + s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/gnome-help.sh \ + > ${WRKDIR}/gnome-help.sh + +post-install: + ${MV} -f ${PREFIX}/bin/yelp ${PREFIX}/bin/yelp-bin + ${MV} -f ${PREFIX}/bin/gnome-help ${PREFIX}/bin/gnome-help-bin + ${INSTALL_SCRIPT} ${WRKDIR}/yelp.sh ${PREFIX}/bin/yelp + ${INSTALL_SCRIPT} ${WRKDIR}/gnome-help.sh ${PREFIX}/bin/gnome-help + +.include <bsd.port.post.mk> diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 84e9d90bbd8e..626d42489854 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/yelp-2.6.5.tar.bz2) = 9bd94af344ee6a0bf69aa6f9cbd6b7e9 -SIZE (gnome2/yelp-2.6.5.tar.bz2) = 654264 +MD5 (gnome2/yelp-2.9.3.tar.bz2) = a6ed659313698900a7170426881b874b +SIZE (gnome2/yelp-2.9.3.tar.bz2) = 637236 diff --git a/x11/yelp/files/gnome-help.sh b/x11/yelp/files/gnome-help.sh new file mode 100644 index 000000000000..0951d0096233 --- /dev/null +++ b/x11/yelp/files/gnome-help.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +dist_bin=`dirname $0` + +MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% + +if [ -n "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$MOZILLA_HOME +fi +export LD_LIBRARY_PATH + +MOZILLA_FIVE_HOME=$MOZILLA_HOME +export MOZILLA_FIVE_HOME + +exec "%%PREFIX%%/bin/gnome-help-bin" "$@" diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure deleted file mode 100644 index 7e0c0705f738..000000000000 --- a/x11/yelp/files/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig Mon Mar 22 19:14:23 2004 -+++ configure Mon Mar 22 19:14:23 2004 -@@ -9879,7 +9879,7 @@ - - YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0" - --idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`" -+idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`" - for ac_prog in gsed sed - do - # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/x11/yelp/files/yelp.sh b/x11/yelp/files/yelp.sh new file mode 100644 index 000000000000..52a6643b7544 --- /dev/null +++ b/x11/yelp/files/yelp.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +dist_bin=`dirname $0` + +MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%% + +if [ -n "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH +else + LD_LIBRARY_PATH=$MOZILLA_HOME +fi +export LD_LIBRARY_PATH + +MOZILLA_FIVE_HOME=$MOZILLA_HOME +export MOZILLA_FIVE_HOME + +exec "%%PREFIX%%/bin/yelp-bin" "$@" diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index d12169a1d3d8..e6dea27dee6a 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -1,47 +1,29 @@ bin/gnome-help +bin/gnome-help-bin bin/yelp +bin/yelp-bin libdata/bonobo/servers/GNOME_Yelp.server share/gnome/applications/yelp.desktop -share/gnome/sgml/docbook/yelp/db2html-admon.xsl -share/gnome/sgml/docbook/yelp/db2html-biblio.xsl -share/gnome/sgml/docbook/yelp/db2html-block.xsl -share/gnome/sgml/docbook/yelp/db2html-callout.xsl -share/gnome/sgml/docbook/yelp/db2html-chunk.xsl -share/gnome/sgml/docbook/yelp/db2html-common.xsl -share/gnome/sgml/docbook/yelp/db2html-division.xsl -share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl -share/gnome/sgml/docbook/yelp/db2html-footnote.xsl -share/gnome/sgml/docbook/yelp/db2html-glossary.xsl -share/gnome/sgml/docbook/yelp/db2html-header.xsl -share/gnome/sgml/docbook/yelp/db2html-html.xsl -share/gnome/sgml/docbook/yelp/db2html-index.xsl -share/gnome/sgml/docbook/yelp/db2html-inline.xsl -share/gnome/sgml/docbook/yelp/db2html-list.xsl -share/gnome/sgml/docbook/yelp/db2html-math.xsl -share/gnome/sgml/docbook/yelp/db2html-media.xsl -share/gnome/sgml/docbook/yelp/db2html-navbar.xsl -share/gnome/sgml/docbook/yelp/db2html-param.xsl -share/gnome/sgml/docbook/yelp/db2html-qanda.xsl -share/gnome/sgml/docbook/yelp/db2html-refentry.xsl -share/gnome/sgml/docbook/yelp/db2html-suppressed.xsl -share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl -share/gnome/sgml/docbook/yelp/db2html-table.xsl -share/gnome/sgml/docbook/yelp/db2html-title.xsl -share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl -share/gnome/sgml/docbook/yelp/db2html-toc.xsl -share/gnome/sgml/docbook/yelp/db2html-xref.xsl share/gnome/sgml/docbook/yelp/db2html.xsl -share/gnome/sgml/docbook/yelp/gettext.xsl -share/gnome/sgml/docbook/yelp/l10n.xml +share/gnome/sgml/docbook/yelp/info2html.xsl share/gnome/sgml/docbook/yelp/man2html.xsl +share/gnome/sgml/docbook/yelp/toc2html.xsl share/gnome/yelp/default.css -share/gnome/yelp/icons/caution.png -share/gnome/yelp/icons/important.png -share/gnome/yelp/icons/note.png -share/gnome/yelp/icons/tip.png -share/gnome/yelp/icons/warning.png +share/gnome/yelp/icons/yelp-icon-caution.png +share/gnome/yelp/icons/yelp-icon-important.png +share/gnome/yelp/icons/yelp-icon-note.png +share/gnome/yelp/icons/yelp-icon-tip.png +share/gnome/yelp/icons/yelp-icon-warning.png +share/gnome/yelp/icons/yelp-watermark-blockquote-00AB.png +share/gnome/yelp/icons/yelp-watermark-blockquote-00BB.png +share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png +share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png +share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png share/gnome/yelp/important_docs.xml +share/gnome/yelp/man.xml +share/gnome/yelp/scrollkeeper.xml share/gnome/yelp/toc.xml +share/gnome/yelp/ui/yelp-ui.xml share/gnome/yelp/ui/yelp.glade share/locale/af/LC_MESSAGES/yelp.mo share/locale/am/LC_MESSAGES/yelp.mo @@ -83,7 +65,6 @@ share/locale/ko/LC_MESSAGES/yelp.mo share/locale/li/LC_MESSAGES/yelp.mo share/locale/lt/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo -share/locale/mi/LC_MESSAGES/yelp.mo share/locale/mk/LC_MESSAGES/yelp.mo share/locale/ml/LC_MESSAGES/yelp.mo share/locale/mn/LC_MESSAGES/yelp.mo @@ -110,7 +91,6 @@ share/locale/sv/LC_MESSAGES/yelp.mo share/locale/ta/LC_MESSAGES/yelp.mo share/locale/tg/LC_MESSAGES/yelp.mo share/locale/th/LC_MESSAGES/yelp.mo -share/locale/tk/LC_MESSAGES/yelp.mo share/locale/tr/LC_MESSAGES/yelp.mo share/locale/uk/LC_MESSAGES/yelp.mo share/locale/vi/LC_MESSAGES/yelp.mo @@ -118,11 +98,13 @@ share/locale/wa/LC_MESSAGES/yelp.mo share/locale/zh_CN/LC_MESSAGES/yelp.mo share/locale/zh_TW/LC_MESSAGES/yelp.mo share/locale/zu/LC_MESSAGES/yelp.mo -@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/zu 2> /dev/null || true +@dirrm share/locale/zu/LC_MESSAGES +@dirrm share/locale/zu +@dirrm share/locale/nso/LC_MESSAGES +@dirrm share/locale/nso +@dirrm share/locale/mr/LC_MESSAGES +@dirrm share/locale/mr @dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp/icons @dirrm share/gnome/yelp @dirrm share/gnome/sgml/docbook/yelp -@dirrm share/gnome/sgml/docbook -@dirrm share/gnome/sgml diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 261b01610a50..966d951dd6c1 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -6,10 +6,10 @@ # PORTNAME= zenity -PORTVERSION= 2.8.2 +PORTVERSION= 2.10.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.8 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 DIST_SUBDIR= gnome2 MAINTAINER= klammer@webonaut.com @@ -25,6 +25,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes +INSTALLS_OMF= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index 5475b2b207d5..ea553b6190df 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/zenity-2.8.2.tar.bz2) = 166e57a71f61ed86cd4f7437ff010b66 -SIZE (gnome2/zenity-2.8.2.tar.bz2) = 721700 +MD5 (gnome2/zenity-2.10.0.tar.bz2) = 2e501bba72b6e7d4f951080b9e5f675b +SIZE (gnome2/zenity-2.10.0.tar.bz2) = 742206 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index d1a62bf16c78..879d5604c2cf 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -6,6 +6,7 @@ share/gnome/help/zenity/C/figures/zenity-error-screenshot.png share/gnome/help/zenity/C/figures/zenity-fileselection-screenshot.png share/gnome/help/zenity/C/figures/zenity-information-screenshot.png share/gnome/help/zenity/C/figures/zenity-list-screenshot.png +share/gnome/help/zenity/C/figures/zenity-notification-screenshot.png share/gnome/help/zenity/C/figures/zenity-progress-screenshot.png share/gnome/help/zenity/C/figures/zenity-question-screenshot.png share/gnome/help/zenity/C/figures/zenity-text-screenshot.png @@ -25,9 +26,7 @@ share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png share/gnome/help/zenity/sr/legal.xml share/gnome/help/zenity/sr/zenity.xml share/gnome/omf/zenity/zenity-C.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true share/gnome/omf/zenity/zenity-sr.omf -@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true share/gnome/zenity/clothes/gnome-tshirt.png share/gnome/zenity/clothes/hawaii-shirt.png share/gnome/zenity/clothes/monk.png @@ -37,6 +36,7 @@ share/gnome/zenity/zenity-calendar.png share/gnome/zenity/zenity-entry.png share/gnome/zenity/zenity-file.png share/gnome/zenity/zenity-list.png +share/gnome/zenity/zenity-notification.png share/gnome/zenity/zenity-progress.png share/gnome/zenity/zenity-text.png share/gnome/zenity/zenity.glade @@ -112,5 +112,3 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C @dirrm share/gnome/help/zenity -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true -@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true |