diff options
| -rw-r--r-- | archivers/file-roller/Makefile | 7 | ||||
| -rw-r--r-- | archivers/file-roller/PLIST | 22 | ||||
| -rw-r--r-- | archivers/file-roller/distinfo | 10 | ||||
| -rw-r--r-- | archivers/file-roller/patches/patch-aa | 10 | ||||
| -rw-r--r-- | multimedia/totem/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/totem/Makefile.common | 7 | ||||
| -rw-r--r-- | multimedia/totem/PLIST | 76 | ||||
| -rw-r--r-- | multimedia/totem/distinfo | 11 | ||||
| -rw-r--r-- | multimedia/totem/patches/patch-aa | 8 | ||||
| -rw-r--r-- | multimedia/totem/patches/patch-ab | 31 |
10 files changed, 139 insertions, 46 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 4d2bdb0313b..153baaf8794 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:25 wiz Exp $ +# $NetBSD: Makefile,v 1.77 2007/11/05 19:27:29 drochner Exp $ # -DISTNAME= file-roller-2.18.4 -PKGREVISION= 4 +DISTNAME= file-roller-2.20.1 CATEGORIES= archivers gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.18/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.20/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST index 0262e0e552a..50f32ff7de0 100644 --- a/archivers/file-roller/PLIST +++ b/archivers/file-roller/PLIST @@ -1,11 +1,15 @@ -@comment $NetBSD: PLIST,v 1.25 2007/09/25 10:54:09 hira Exp $ +@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:27:29 drochner Exp $ bin/file-roller lib/nautilus/extensions-1.0/libnautilus-fileroller.la libexec/file-roller/isoinfo.sh -libexec/file-roller/move-here.sh share/applications/file-roller.desktop -share/file-roller/glade/ask-password.glade -share/file-roller/glade/file-roller.glade +share/file-roller/glade/add-options.glade +share/file-roller/glade/batch-add-files.glade +share/file-roller/glade/batch-password.glade +share/file-roller/glade/delete.glade +share/file-roller/glade/open-with.glade +share/file-roller/glade/password.glade +share/file-roller/glade/properties.glade share/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png share/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png share/file-roller/icons/hicolor/16x16/actions/extract-archive.png @@ -57,6 +61,12 @@ share/gnome/help/file-roller/nl/figures/file-roller_main_window.png share/gnome/help/file-roller/nl/figures/file-roller_rightarrow.png share/gnome/help/file-roller/nl/figures/file-roller_uparrow.png share/gnome/help/file-roller/nl/file-roller.xml +share/gnome/help/file-roller/oc/figures/file-roller_home.png +share/gnome/help/file-roller/oc/figures/file-roller_leftarrow.png +share/gnome/help/file-roller/oc/figures/file-roller_main_window.png +share/gnome/help/file-roller/oc/figures/file-roller_rightarrow.png +share/gnome/help/file-roller/oc/figures/file-roller_uparrow.png +share/gnome/help/file-roller/oc/file-roller.xml share/gnome/help/file-roller/ru/figures/file-roller_home.png share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png share/gnome/help/file-roller/ru/figures/file-roller_main_window.png @@ -141,6 +151,7 @@ share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/ro/LC_MESSAGES/file-roller.mo share/locale/ru/LC_MESSAGES/file-roller.mo share/locale/rw/LC_MESSAGES/file-roller.mo +share/locale/si/LC_MESSAGES/file-roller.mo share/locale/sk/LC_MESSAGES/file-roller.mo share/locale/sl/LC_MESSAGES/file-roller.mo share/locale/sq/LC_MESSAGES/file-roller.mo @@ -166,6 +177,7 @@ share/omf/file-roller/file-roller-es.omf share/omf/file-roller/file-roller-fr.omf share/omf/file-roller/file-roller-it.omf share/omf/file-roller/file-roller-nl.omf +share/omf/file-roller/file-roller-oc.omf share/omf/file-roller/file-roller-ru.omf share/omf/file-roller/file-roller-sv.omf share/omf/file-roller/file-roller-uk.omf @@ -182,6 +194,8 @@ share/omf/file-roller/file-roller-uk.omf @dirrm share/gnome/help/file-roller/sv @dirrm share/gnome/help/file-roller/ru/figures @dirrm share/gnome/help/file-roller/ru +@dirrm share/gnome/help/file-roller/oc/figures +@dirrm share/gnome/help/file-roller/oc @dirrm share/gnome/help/file-roller/nl/figures @dirrm share/gnome/help/file-roller/nl @dirrm share/gnome/help/file-roller/it/figures diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo index d84091cfda9..4c986774f7e 100644 --- a/archivers/file-roller/distinfo +++ b/archivers/file-roller/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.32 2007/07/13 16:28:39 drochner Exp $ +$NetBSD: distinfo,v 1.33 2007/11/05 19:27:29 drochner Exp $ -SHA1 (file-roller-2.18.4.tar.bz2) = 062ab5f46e4b95a1b55cbcb16c778c4b28c08d75 -RMD160 (file-roller-2.18.4.tar.bz2) = 07dfaeac5618032eb01d10a998b7bc80ed96c6da -Size (file-roller-2.18.4.tar.bz2) = 1175112 bytes -SHA1 (patch-aa) = 7e6773de99b4277874ce5b01530de357848b2d69 +SHA1 (file-roller-2.20.1.tar.bz2) = 34d6ebb8297497ccc7ce585d2a622d94505815bf +RMD160 (file-roller-2.20.1.tar.bz2) = 3bc9c14db78db53f196cfd9a585f25222e760ec0 +Size (file-roller-2.20.1.tar.bz2) = 1223800 bytes +SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa index 610e76962a0..9f34d0a104a 100644 --- a/archivers/file-roller/patches/patch-aa +++ b/archivers/file-roller/patches/patch-aa @@ -1,12 +1,12 @@ -$NetBSD: patch-aa,v 1.9 2007/04/11 18:20:38 drochner Exp $ +$NetBSD: patch-aa,v 1.10 2007/11/05 19:27:29 drochner Exp $ ---- data/Makefile.in.orig 2007-03-12 20:26:05.000000000 +0100 +--- data/Makefile.in.orig 2007-09-17 21:40:34.000000000 +0200 +++ data/Makefile.in -@@ -596,7 +596,6 @@ install-data-local: - @GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) +@@ -623,7 +623,6 @@ uninstall-hook: update-icon-cache + update-icon-cache: if test -z "$(DESTDIR)"; then \ echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ else \ - echo "*** Icon cache not updated. After install, run this:"; \ + echo "*** Icon cache not updated. After (un)install, run this:"; \ echo "*** $(gtk_update_icon_cache)"; \ diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index 2d7699322dd..910b1f70b4a 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:09 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2007/11/05 19:26:20 drochner Exp $ # .include "Makefile.common" COMMENT+= (using GStreamer) -PKGREVISION= 2 CONFLICTS+= totem-xine-[0-9]* diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common index 040b3ddb48d..a0da7542e2b 100644 --- a/multimedia/totem/Makefile.common +++ b/multimedia/totem/Makefile.common @@ -1,10 +1,9 @@ -# $NetBSD: Makefile.common,v 1.35 2007/09/21 13:04:09 wiz Exp $ +# $NetBSD: Makefile.common,v 1.36 2007/11/05 19:26:20 drochner Exp $ # -DISTNAME= totem-2.18.2 -PKGREVISION= 2 +DISTNAME= totem-2.20.1 CATEGORIES= multimedia gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/2.18/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/totem/2.20/} MAINTAINER= jmmv@NetBSD.org HOMEPAGE= http://www.gnome.org/projects/totem/ diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST index 4079625d22e..236d5510cbb 100644 --- a/multimedia/totem/PLIST +++ b/multimedia/totem/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2007/09/25 10:54:16 hira Exp $ +@comment $NetBSD: PLIST,v 1.14 2007/11/05 19:26:20 drochner Exp $ bin/totem bin/totem-video-indexer bin/totem-video-thumbnailer @@ -9,6 +9,17 @@ include/totem/1/plparser/totem-pl-parser.h lib/libtotem-plparser.la lib/nautilus/extensions-1.0/libtotem-properties-page.la lib/pkgconfig/totem-plparser.pc +lib/totem/plugins/gromit/gromit.totem-plugin +lib/totem/plugins/gromit/libgromit.la +lib/totem/plugins/ontop/libontop.la +lib/totem/plugins/ontop/ontop.totem-plugin +lib/totem/plugins/properties/libmovie-properties.la +lib/totem/plugins/properties/movie-properties.totem-plugin +lib/totem/plugins/screensaver/libscreensaver.la +lib/totem/plugins/screensaver/screensaver.totem-plugin +lib/totem/plugins/skipto/libskipto.la +lib/totem/plugins/skipto/skipto.totem-plugin +lib/totem/plugins/skipto/skipto.ui man/man1/totem-video-thumbnailer.1 man/man1/totem.1 share/applications/totem.desktop @@ -28,6 +39,15 @@ share/gnome/help/totem/C/totem.xml share/gnome/help/totem/bg/figures/totem_start_window.png share/gnome/help/totem/bg/legal.xml share/gnome/help/totem/bg/totem.xml +share/gnome/help/totem/ca/figures/totem_next_button.png +share/gnome/help/totem/ca/figures/totem_pause_button.png +share/gnome/help/totem/ca/figures/totem_play_button.png +share/gnome/help/totem/ca/figures/totem_previous_button.png +share/gnome/help/totem/ca/figures/totem_show_playlist_button.png +share/gnome/help/totem/ca/figures/totem_start_window.png +share/gnome/help/totem/ca/figures/totem_volume_maximum_button.png +share/gnome/help/totem/ca/figures/totem_volume_mute_button.png +share/gnome/help/totem/ca/totem.xml share/gnome/help/totem/de/figures/totem_next_button.png share/gnome/help/totem/de/figures/totem_pause_button.png share/gnome/help/totem/de/figures/totem_play_button.png @@ -37,6 +57,15 @@ share/gnome/help/totem/de/figures/totem_start_window.png share/gnome/help/totem/de/figures/totem_volume_maximum_button.png share/gnome/help/totem/de/figures/totem_volume_mute_button.png share/gnome/help/totem/de/totem.xml +share/gnome/help/totem/en_GB/figures/totem_next_button.png +share/gnome/help/totem/en_GB/figures/totem_pause_button.png +share/gnome/help/totem/en_GB/figures/totem_play_button.png +share/gnome/help/totem/en_GB/figures/totem_previous_button.png +share/gnome/help/totem/en_GB/figures/totem_show_playlist_button.png +share/gnome/help/totem/en_GB/figures/totem_start_window.png +share/gnome/help/totem/en_GB/figures/totem_volume_maximum_button.png +share/gnome/help/totem/en_GB/figures/totem_volume_mute_button.png +share/gnome/help/totem/en_GB/totem.xml share/gnome/help/totem/es/figures/totem_next_button.png share/gnome/help/totem/es/figures/totem_pause_button.png share/gnome/help/totem/es/figures/totem_play_button.png @@ -55,6 +84,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png share/gnome/help/totem/fr/figures/totem_volume_mute_button.png share/gnome/help/totem/fr/totem.xml +share/gnome/help/totem/oc/figures/totem_next_button.png +share/gnome/help/totem/oc/figures/totem_pause_button.png +share/gnome/help/totem/oc/figures/totem_play_button.png +share/gnome/help/totem/oc/figures/totem_previous_button.png +share/gnome/help/totem/oc/figures/totem_show_playlist_button.png +share/gnome/help/totem/oc/figures/totem_start_window.png +share/gnome/help/totem/oc/figures/totem_volume_maximum_button.png +share/gnome/help/totem/oc/figures/totem_volume_mute_button.png +share/gnome/help/totem/oc/totem.xml share/gnome/help/totem/pa/figures/totem_next_button.png share/gnome/help/totem/pa/figures/totem_pause_button.png share/gnome/help/totem/pa/figures/totem_play_button.png @@ -154,6 +192,7 @@ share/locale/nb/LC_MESSAGES/totem.mo share/locale/ne/LC_MESSAGES/totem.mo share/locale/nl/LC_MESSAGES/totem.mo share/locale/nn/LC_MESSAGES/totem.mo +share/locale/oc/LC_MESSAGES/totem.mo share/locale/or/LC_MESSAGES/totem.mo share/locale/pa/LC_MESSAGES/totem.mo share/locale/pl/LC_MESSAGES/totem.mo @@ -182,33 +221,31 @@ share/locale/zh_HK/LC_MESSAGES/totem.mo share/locale/zh_TW/LC_MESSAGES/totem.mo share/omf/totem/totem-C.omf share/omf/totem/totem-bg.omf +share/omf/totem/totem-ca.omf share/omf/totem/totem-de.omf +share/omf/totem/totem-en_GB.omf share/omf/totem/totem-es.omf share/omf/totem/totem-fr.omf +share/omf/totem/totem-oc.omf share/omf/totem/totem-pa.omf share/omf/totem/totem-pt_BR.omf share/omf/totem/totem-ru.omf share/omf/totem/totem-sv.omf share/omf/totem/totem-uk.omf -share/pixmaps/vanity.png share/totem/filmholes-big-left.png share/totem/filmholes-big-right.png share/totem/filmholes.png -share/totem/mozilla-viewer.glade +share/totem/fullscreen.ui +share/totem/mozilla-viewer.ui share/totem/playlist-ui.xml -share/totem/playlist.glade -share/totem/properties.glade -share/totem/screenshot.glade -share/totem/skip_to.glade -share/totem/stock-tool-brightness-contrast-22.png +share/totem/playlist.ui +share/totem/plugins.ui +share/totem/properties.ui share/totem/totem-ui.xml -share/totem/totem.glade +share/totem/totem.ui share/totem/totem_logo.png -share/totem/uri.glade -share/totem/vanity.glade -share/totem/vanity.png +share/totem/uri.ui @dirrm share/totem -@comment in xdg-dirs: @dirrm share/pixmaps @dirrm share/omf/totem @comment in scrollkeeper: @dirrm share/omf @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps @@ -227,12 +264,18 @@ share/totem/vanity.png @dirrm share/gnome/help/totem/pt_BR @dirrm share/gnome/help/totem/pa/figures @dirrm share/gnome/help/totem/pa +@dirrm share/gnome/help/totem/oc/figures +@dirrm share/gnome/help/totem/oc @dirrm share/gnome/help/totem/fr/figures @dirrm share/gnome/help/totem/fr @dirrm share/gnome/help/totem/es/figures @dirrm share/gnome/help/totem/es +@dirrm share/gnome/help/totem/en_GB/figures +@dirrm share/gnome/help/totem/en_GB @dirrm share/gnome/help/totem/de/figures @dirrm share/gnome/help/totem/de +@dirrm share/gnome/help/totem/ca/figures +@dirrm share/gnome/help/totem/ca @dirrm share/gnome/help/totem/bg/figures @dirrm share/gnome/help/totem/bg @dirrm share/gnome/help/totem/C/figures @@ -241,6 +284,13 @@ share/totem/vanity.png @comment in gnome2-dirs: @dirrm share/gnome/help @comment in GConf: @dirrm share/gconf/schemas @comment in xdg-dirs: @dirrm share/applications +@dirrm lib/totem/plugins/skipto +@dirrm lib/totem/plugins/screensaver +@dirrm lib/totem/plugins/properties +@dirrm lib/totem/plugins/ontop +@dirrm lib/totem/plugins/gromit +@dirrm lib/totem/plugins +@dirrm lib/totem @comment in nautilus: @dirrm lib/nautilus/extensions-1.0 @dirrm include/totem/1/plparser @dirrm include/totem/1 diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo index af41f8c29b6..deeb947360d 100644 --- a/multimedia/totem/distinfo +++ b/multimedia/totem/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.17 2007/06/15 18:47:22 drochner Exp $ +$NetBSD: distinfo,v 1.18 2007/11/05 19:26:20 drochner Exp $ -SHA1 (totem-2.18.2.tar.gz) = ea491e63c6e0e9a567969487e8f0eda09977b5c5 -RMD160 (totem-2.18.2.tar.gz) = 7ff5791cdd07133ba5e100792b4a69b2df17d9bb -Size (totem-2.18.2.tar.gz) = 2878685 bytes -SHA1 (patch-aa) = e3fdbb095e9f1c46cf13a5e83efc79d686ad1d50 +SHA1 (totem-2.20.1.tar.gz) = b733d9bad2cd525c66d128bc29de0d14a8f7b2f1 +RMD160 (totem-2.20.1.tar.gz) = 7bc5e175175f8d9b2df296f2a9f176b7d330d6e5 +Size (totem-2.20.1.tar.gz) = 3121580 bytes +SHA1 (patch-aa) = 3a2bb0a2954df435f408dd9c048a36a1a7590427 +SHA1 (patch-ab) = 267d8bea252488933fa383d5fd2188f72980b873 diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa index 7da783a243c..7844bf2351d 100644 --- a/multimedia/totem/patches/patch-aa +++ b/multimedia/totem/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.6 2007/04/11 18:03:39 drochner Exp $ +$NetBSD: patch-aa,v 1.7 2007/11/05 19:26:20 drochner Exp $ ---- Makefile.in.orig 2007-04-04 16:41:43.000000000 +0200 +--- Makefile.in.orig 2007-09-16 23:55:43.000000000 +0200 +++ Makefile.in @@ -73,7 +73,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags --DIST_SUBDIRS = po data src help browser-plugin -+DIST_SUBDIRS = po data src help +-DIST_SUBDIRS = bindings po data lib src help browser-plugin ++DIST_SUBDIRS = bindings po data lib src help DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/multimedia/totem/patches/patch-ab b/multimedia/totem/patches/patch-ab new file mode 100644 index 00000000000..f4496fb9f16 --- /dev/null +++ b/multimedia/totem/patches/patch-ab @@ -0,0 +1,31 @@ +$NetBSD: patch-ab,v 1.5 2007/11/05 19:26:20 drochner Exp $ + +--- configure.orig 2007-09-28 22:09:38.000000000 +0200 ++++ configure +@@ -23058,7 +23058,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS" + + plugin_error_or_ignore() + { +- if test "${error_on_bad_plugin}" == "1" ; then ++ if test "${error_on_bad_plugin}" = "1" ; then + { { echo "$as_me:$LINENO: error: $1" >&5 + echo "$as_me: error: $1" >&2;} + { (exit 1); exit 1; }; } +@@ -23080,7 +23080,7 @@ fi + used_plugins="" + used_plugins2="" + +-if test "x${with_plugins}" == "xautodetect" ; then ++if test "x${with_plugins}" = "xautodetect" ; then + # Default to all plugins and just ignore them if they won't compile + with_plugins="all" + error_on_bad_plugin="0" +@@ -23559,7 +23559,7 @@ fi + esac + + # Add the specified plugin +- if test "${add_plugin}" == "1" ; then ++ if test "${add_plugin}" = "1" ; then + used_plugins2="${used_plugins2} ${plugin}" + fi + done |