From 99db1dda97820ead3ef56154e38da091b2efd784 Mon Sep 17 00:00:00 2001 From: Ade Lovett Date: Tue, 10 Oct 2000 17:16:22 +0000 Subject: [PATCH] Update to 0.5.11 and revert to primary MASTER_SITE, as the GNOME sites tend to lag behind on this. This also fixes ports/21821 by putting everything in the right place now that bsd.gnome.mk is being used. --- devel/glade/Makefile | 8 ++---- devel/glade/distinfo | 2 +- devel/glade/pkg-plist | 64 ++++++++++++++++++++++-------------------- devel/glade2/Makefile | 8 ++---- devel/glade2/distinfo | 2 +- devel/glade2/pkg-plist | 64 ++++++++++++++++++++++-------------------- 6 files changed, 72 insertions(+), 76 deletions(-) diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 46540636d01a..031f216cae02 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -6,15 +6,12 @@ # PORTNAME= glade -PORTVERSION= 0.5.9 +PORTVERSION= 0.5.11 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/glade +MASTER_SITES= http://glade.pn.org/ MAINTAINER= ade@FreeBSD.org -FETCH_BEFORE_ARGS= -b - USE_X_PREFIX= yes USE_GNOME= yes USE_LIBTOOL= yes @@ -28,7 +25,6 @@ pre-patch: s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include diff --git a/devel/glade/distinfo b/devel/glade/distinfo index 6cf61821439c..ef97c01e8ee3 100644 --- a/devel/glade/distinfo +++ b/devel/glade/distinfo @@ -1 +1 @@ -MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a +MD5 (glade-0.5.11.tar.gz) = 23d063133cbbfd331e3ee0f694efa610 diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index 8db740474c64..53a8cf085a6a 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -1,31 +1,31 @@ bin/glade -share/glade/gnome/Makefile.am -share/glade/gnome/aclocal-include.m4 -share/glade/gnome/autogen.sh -share/glade/gnome/compiler-flags.m4 -share/glade/gnome/curses.m4 -share/glade/gnome/gnome-bonobo-check.m4 -share/glade/gnome/gnome-common.m4 -share/glade/gnome/gnome-fileutils.m4 -share/glade/gnome/gnome-ghttp-check.m4 -share/glade/gnome/gnome-gnorba-check.m4 -share/glade/gnome/gnome-guile-checks.m4 -share/glade/gnome/gnome-libgtop-check.m4 -share/glade/gnome/gnome-objc-checks.m4 -share/glade/gnome/gnome-orbit-check.m4 -share/glade/gnome/gnome-print-check.m4 -share/glade/gnome/gnome-pthread-check.m4 -share/glade/gnome/gnome-support.m4 -share/glade/gnome/gnome-undelfs.m4 -share/glade/gnome/gnome-vfs.m4 -share/glade/gnome/gnome-x-checks.m4 -share/glade/gnome/gnome-xml-check.m4 -share/glade/gnome/gnome.m4 -share/glade/gnome/gperf-check.m4 -share/glade/gnome/linger.m4 -share/glade/gnome/need-declaration.m4 -share/glade/gtk/autogen.sh share/gnome/apps/Development/glade.desktop +share/gnome/glade/gnome/Makefile.am +share/gnome/glade/gnome/aclocal-include.m4 +share/gnome/glade/gnome/autogen.sh +share/gnome/glade/gnome/compiler-flags.m4 +share/gnome/glade/gnome/curses.m4 +share/gnome/glade/gnome/gnome-bonobo-check.m4 +share/gnome/glade/gnome/gnome-common.m4 +share/gnome/glade/gnome/gnome-fileutils.m4 +share/gnome/glade/gnome/gnome-ghttp-check.m4 +share/gnome/glade/gnome/gnome-gnorba-check.m4 +share/gnome/glade/gnome/gnome-guile-checks.m4 +share/gnome/glade/gnome/gnome-libgtop-check.m4 +share/gnome/glade/gnome/gnome-objc-checks.m4 +share/gnome/glade/gnome/gnome-orbit-check.m4 +share/gnome/glade/gnome/gnome-print-check.m4 +share/gnome/glade/gnome/gnome-pthread-check.m4 +share/gnome/glade/gnome/gnome-support.m4 +share/gnome/glade/gnome/gnome-undelfs.m4 +share/gnome/glade/gnome/gnome-vfs.m4 +share/gnome/glade/gnome/gnome-x-checks.m4 +share/gnome/glade/gnome/gnome-xml-check.m4 +share/gnome/glade/gnome/gnome.m4 +share/gnome/glade/gnome/gperf-check.m4 +share/gnome/glade/gnome/linger.m4 +share/gnome/glade/gnome/need-declaration.m4 +share/gnome/glade/gtk/autogen.sh share/gnome/help/glade/C/faq/docbook.css share/gnome/help/glade/C/faq/index.html share/gnome/help/glade/C/faq/ln7.html @@ -107,8 +107,8 @@ share/gnome/help/glade/C/user-guide/windows-editor.html share/gnome/help/glade/C/user-guide/windows-palette.html share/gnome/help/glade/C/user-guide/windows-tree.html share/gnome/help/glade/C/user-guide/windows.html -share/gnome/help/glade/C/user-guide/x230.html -share/gnome/help/glade/C/user-guide/x329.html +share/gnome/help/glade/C/user-guide/x225.html +share/gnome/help/glade/C/user-guide/x324.html share/gnome/pixmaps/glade.png share/gnome/pixmaps/glade/glade_logo.png share/locale/ca/LC_MESSAGES/glade.mo @@ -123,11 +123,13 @@ share/locale/ga/LC_MESSAGES/glade.mo share/locale/gl/LC_MESSAGES/glade.mo share/locale/it/LC_MESSAGES/glade.mo share/locale/ja/LC_MESSAGES/glade.mo +share/locale/ko/LC_MESSAGES/glade.mo share/locale/no/LC_MESSAGES/glade.mo share/locale/pl/LC_MESSAGES/glade.mo share/locale/pt_BR/LC_MESSAGES/glade.mo share/locale/ru/LC_MESSAGES/glade.mo share/locale/sv/LC_MESSAGES/glade.mo +share/locale/tr/LC_MESSAGES/glade.mo share/locale/uk/LC_MESSAGES/glade.mo @dirrm share/gnome/pixmaps/glade @dirrm share/gnome/help/glade/C/user-guide/user-guide-images @@ -139,6 +141,6 @@ share/locale/uk/LC_MESSAGES/glade.mo @dirrm share/gnome/help/glade/C/faq @dirrm share/gnome/help/glade/C @dirrm share/gnome/help/glade -@dirrm share/glade/gtk -@dirrm share/glade/gnome -@dirrm share/glade +@dirrm share/gnome/glade/gtk +@dirrm share/gnome/glade/gnome +@dirrm share/gnome/glade diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 46540636d01a..031f216cae02 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -6,15 +6,12 @@ # PORTNAME= glade -PORTVERSION= 0.5.9 +PORTVERSION= 0.5.11 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/glade +MASTER_SITES= http://glade.pn.org/ MAINTAINER= ade@FreeBSD.org -FETCH_BEFORE_ARGS= -b - USE_X_PREFIX= yes USE_GNOME= yes USE_LIBTOOL= yes @@ -28,7 +25,6 @@ pre-patch: s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ - s|\$\(datadir\)/\@PACKAGE\@|\$\(prefix\)/share/\@PACKAGE\@|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo index 6cf61821439c..ef97c01e8ee3 100644 --- a/devel/glade2/distinfo +++ b/devel/glade2/distinfo @@ -1 +1 @@ -MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a +MD5 (glade-0.5.11.tar.gz) = 23d063133cbbfd331e3ee0f694efa610 diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist index 8db740474c64..53a8cf085a6a 100644 --- a/devel/glade2/pkg-plist +++ b/devel/glade2/pkg-plist @@ -1,31 +1,31 @@ bin/glade -share/glade/gnome/Makefile.am -share/glade/gnome/aclocal-include.m4 -share/glade/gnome/autogen.sh -share/glade/gnome/compiler-flags.m4 -share/glade/gnome/curses.m4 -share/glade/gnome/gnome-bonobo-check.m4 -share/glade/gnome/gnome-common.m4 -share/glade/gnome/gnome-fileutils.m4 -share/glade/gnome/gnome-ghttp-check.m4 -share/glade/gnome/gnome-gnorba-check.m4 -share/glade/gnome/gnome-guile-checks.m4 -share/glade/gnome/gnome-libgtop-check.m4 -share/glade/gnome/gnome-objc-checks.m4 -share/glade/gnome/gnome-orbit-check.m4 -share/glade/gnome/gnome-print-check.m4 -share/glade/gnome/gnome-pthread-check.m4 -share/glade/gnome/gnome-support.m4 -share/glade/gnome/gnome-undelfs.m4 -share/glade/gnome/gnome-vfs.m4 -share/glade/gnome/gnome-x-checks.m4 -share/glade/gnome/gnome-xml-check.m4 -share/glade/gnome/gnome.m4 -share/glade/gnome/gperf-check.m4 -share/glade/gnome/linger.m4 -share/glade/gnome/need-declaration.m4 -share/glade/gtk/autogen.sh share/gnome/apps/Development/glade.desktop +share/gnome/glade/gnome/Makefile.am +share/gnome/glade/gnome/aclocal-include.m4 +share/gnome/glade/gnome/autogen.sh +share/gnome/glade/gnome/compiler-flags.m4 +share/gnome/glade/gnome/curses.m4 +share/gnome/glade/gnome/gnome-bonobo-check.m4 +share/gnome/glade/gnome/gnome-common.m4 +share/gnome/glade/gnome/gnome-fileutils.m4 +share/gnome/glade/gnome/gnome-ghttp-check.m4 +share/gnome/glade/gnome/gnome-gnorba-check.m4 +share/gnome/glade/gnome/gnome-guile-checks.m4 +share/gnome/glade/gnome/gnome-libgtop-check.m4 +share/gnome/glade/gnome/gnome-objc-checks.m4 +share/gnome/glade/gnome/gnome-orbit-check.m4 +share/gnome/glade/gnome/gnome-print-check.m4 +share/gnome/glade/gnome/gnome-pthread-check.m4 +share/gnome/glade/gnome/gnome-support.m4 +share/gnome/glade/gnome/gnome-undelfs.m4 +share/gnome/glade/gnome/gnome-vfs.m4 +share/gnome/glade/gnome/gnome-x-checks.m4 +share/gnome/glade/gnome/gnome-xml-check.m4 +share/gnome/glade/gnome/gnome.m4 +share/gnome/glade/gnome/gperf-check.m4 +share/gnome/glade/gnome/linger.m4 +share/gnome/glade/gnome/need-declaration.m4 +share/gnome/glade/gtk/autogen.sh share/gnome/help/glade/C/faq/docbook.css share/gnome/help/glade/C/faq/index.html share/gnome/help/glade/C/faq/ln7.html @@ -107,8 +107,8 @@ share/gnome/help/glade/C/user-guide/windows-editor.html share/gnome/help/glade/C/user-guide/windows-palette.html share/gnome/help/glade/C/user-guide/windows-tree.html share/gnome/help/glade/C/user-guide/windows.html -share/gnome/help/glade/C/user-guide/x230.html -share/gnome/help/glade/C/user-guide/x329.html +share/gnome/help/glade/C/user-guide/x225.html +share/gnome/help/glade/C/user-guide/x324.html share/gnome/pixmaps/glade.png share/gnome/pixmaps/glade/glade_logo.png share/locale/ca/LC_MESSAGES/glade.mo @@ -123,11 +123,13 @@ share/locale/ga/LC_MESSAGES/glade.mo share/locale/gl/LC_MESSAGES/glade.mo share/locale/it/LC_MESSAGES/glade.mo share/locale/ja/LC_MESSAGES/glade.mo +share/locale/ko/LC_MESSAGES/glade.mo share/locale/no/LC_MESSAGES/glade.mo share/locale/pl/LC_MESSAGES/glade.mo share/locale/pt_BR/LC_MESSAGES/glade.mo share/locale/ru/LC_MESSAGES/glade.mo share/locale/sv/LC_MESSAGES/glade.mo +share/locale/tr/LC_MESSAGES/glade.mo share/locale/uk/LC_MESSAGES/glade.mo @dirrm share/gnome/pixmaps/glade @dirrm share/gnome/help/glade/C/user-guide/user-guide-images @@ -139,6 +141,6 @@ share/locale/uk/LC_MESSAGES/glade.mo @dirrm share/gnome/help/glade/C/faq @dirrm share/gnome/help/glade/C @dirrm share/gnome/help/glade -@dirrm share/glade/gtk -@dirrm share/glade/gnome -@dirrm share/glade +@dirrm share/gnome/glade/gtk +@dirrm share/gnome/glade/gnome +@dirrm share/gnome/glade