From dc1b70af611a5c59f3261001d3796373a7d1d269 Mon Sep 17 00:00:00 2001 From: marcm Date: Fri, 3 Jan 2003 21:39:28 +0000 Subject: [PATCH] Update to 0.22 ok todd@ --- devel/gal/Makefile | 6 +- devel/gal/distinfo | 6 +- devel/gal/patches/patch-configure | 26 +++--- devel/gal/pkg/PFRAG.shared | 4 +- devel/gal/pkg/PLIST | 132 +++++++++++++++--------------- 5 files changed, 87 insertions(+), 87 deletions(-) diff --git a/devel/gal/Makefile b/devel/gal/Makefile index 5e484670529..2437a70078f 100644 --- a/devel/gal/Makefile +++ b/devel/gal/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.4 2002/11/14 20:56:46 marcm Exp $ +# $OpenBSD: Makefile,v 1.5 2003/01/03 21:39:28 marcm Exp $ COMMENT= "GNOME Application Libs" -DISTNAME= gal-0.21 +DISTNAME= gal-0.22 CATEGORIES= devel x11/gnome HOMEPAGE= http://www.gnome.org/ @@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal/0.21/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gal/0.22/} EXTRACT_SUFX= .tar.bz2 MODULES= gettext diff --git a/devel/gal/distinfo b/devel/gal/distinfo index b94d70e4520..c988c7ce00c 100644 --- a/devel/gal/distinfo +++ b/devel/gal/distinfo @@ -1,3 +1,3 @@ -MD5 (gal-0.21.tar.bz2) = 6fc4f5faad1d3a0699dca6cf6fd49b63 -RMD160 (gal-0.21.tar.bz2) = f5d7720b2ceb9d9b1abb9ff75b248ef51057ef9c -SHA1 (gal-0.21.tar.bz2) = c666e25a6b1238e3d8fff3b7ac34e856d51a8eb4 +MD5 (gal-0.22.tar.bz2) = f2d5e447b6e239bc68f66f8a48d0897b +RMD160 (gal-0.22.tar.bz2) = 29dc9b99330330d3af9feb9c838ff359f69671ee +SHA1 (gal-0.22.tar.bz2) = 55f977203f04400ad6a05a5d3f1123657b2cb5b1 diff --git a/devel/gal/patches/patch-configure b/devel/gal/patches/patch-configure index b65cc85f629..a848073d1c8 100644 --- a/devel/gal/patches/patch-configure +++ b/devel/gal/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.2 2002/11/14 20:56:46 marcm Exp $ ---- configure.orig Wed Sep 4 13:40:17 2002 -+++ configure Thu Oct 3 13:22:47 2002 -@@ -3906,8 +3906,8 @@ else +$OpenBSD: patch-configure,v 1.3 2003/01/03 21:39:28 marcm Exp $ +--- configure.orig Thu Dec 5 09:12:52 2002 ++++ configure Sat Dec 14 21:19:48 2002 +@@ -5560,8 +5560,8 @@ else hardcode_direct=yes hardcode_shlibpath_var=no if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then @@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.2 2002/11/14 20:56:46 marcm Exp $ export_dynamic_flag_spec='${wl}-E' else case "$host_os" in -@@ -3916,8 +3916,8 @@ else +@@ -5570,8 +5570,8 @@ else hardcode_libdir_flag_spec='-R$libdir' ;; *) @@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.2 2002/11/14 20:56:46 marcm Exp $ ;; esac fi -@@ -4429,6 +4429,8 @@ openbsd*) +@@ -6087,6 +6087,8 @@ openbsd*) version_type=sunos need_lib_prefix=no need_version=no @@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.2 2002/11/14 20:56:46 marcm Exp $ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then case "$host_os" in openbsd2.[89] | openbsd2.[89].*) -@@ -8051,6 +8053,10 @@ fi +@@ -10317,6 +10319,10 @@ fi fi @@ -42,13 +42,13 @@ $OpenBSD: patch-configure,v 1.2 2002/11/14 20:56:46 marcm Exp $ + if test "$gt_cv_func_gettext_libc" = "yes" \ || test "$gt_cv_func_gettext_libintl" = "yes"; then - cat >> confdefs.h <<\EOF -@@ -9172,7 +9178,7 @@ fi - - trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + cat >>confdefs.h <<\EOF +@@ -11606,7 +11612,7 @@ s/^[^=]*=[ ]*$//; + }' + fi -DEFS=-DHAVE_CONFIG_H +DEFS="-DHAVE_CONFIG_H -I\$(top_srcdir)" - # Without the "./", some shells look in PATH for config.status. - : ${CONFIG_STATUS=./config.status} + mv -f po/POTFILES po/POTFILES.tmp + sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES diff --git a/devel/gal/pkg/PFRAG.shared b/devel/gal/pkg/PFRAG.shared index af796f28592..226787e156d 100644 --- a/devel/gal/pkg/PFRAG.shared +++ b/devel/gal/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2002/11/14 20:56:46 marcm Exp $ -lib/libgal.so.21.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2003/01/03 21:39:28 marcm Exp $ +lib/libgal.so.22.0 DYNLIBDIR(%D/lib) diff --git a/devel/gal/pkg/PLIST b/devel/gal/pkg/PLIST index 06120f09683..54b7d9e8c9f 100644 --- a/devel/gal/pkg/PLIST +++ b/devel/gal/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2002/11/14 20:56:46 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.3 2003/01/03 21:39:28 marcm Exp $ include/gal/e-paned/e-hpaned.h include/gal/e-paned/e-paned.h include/gal/e-paned/e-vpaned.h @@ -147,65 +147,65 @@ share/doc/gal/gal-sections.txt share/doc/gal/gal.hierarchy share/doc/gal/gal.signals share/doc/gal/gal.types -share/etable/0.21/glade/e-table-config-no-group.glade -share/etable/0.21/glade/e-table-config.glade -share/etable/0.21/glade/e-table-field-chooser.glade -share/etable/0.21/glade/e-table-group.glade -share/gal/0.21/glade/e-categories-master-list-dialog.glade -share/gal/0.21/glade/gal-categories.glade -share/gal/0.21/glade/gal-define-views.glade -share/gal/0.21/glade/gal-view-instance-save-as-dialog.glade -share/gal/0.21/glade/gal-view-new-dialog.glade -share/gal/0.21/pixmaps/categories/category_birthday_16.png -share/gal/0.21/pixmaps/categories/category_business_16.png -share/gal/0.21/pixmaps/categories/category_favorites_16.png -share/gal/0.21/pixmaps/categories/category_gifts_16.png -share/gal/0.21/pixmaps/categories/category_goals_16.png -share/gal/0.21/pixmaps/categories/category_holiday-cards_16.png -share/gal/0.21/pixmaps/categories/category_holiday_16.png -share/gal/0.21/pixmaps/categories/category_hot-contacts_16.png -share/gal/0.21/pixmaps/categories/category_ideas_16.png -share/gal/0.21/pixmaps/categories/category_international_16.png -share/gal/0.21/pixmaps/categories/category_key-customer_16.png -share/gal/0.21/pixmaps/categories/category_miscellaneous_16.png -share/gal/0.21/pixmaps/categories/category_personal_16.png -share/gal/0.21/pixmaps/categories/category_phonecalls_16.png -share/gal/0.21/pixmaps/categories/category_status_16.png -share/gal/0.21/pixmaps/categories/category_strategies_16.png -share/gal/0.21/pixmaps/categories/category_suppliers_16.png -share/gal/0.21/pixmaps/categories/category_time-and-expenses_16.png -share/locale/az/LC_MESSAGES/gal-0.21.mo -share/locale/ca/LC_MESSAGES/gal-0.21.mo -share/locale/cs/LC_MESSAGES/gal-0.21.mo -share/locale/da/LC_MESSAGES/gal-0.21.mo -share/locale/de/LC_MESSAGES/gal-0.21.mo -share/locale/el/LC_MESSAGES/gal-0.21.mo -share/locale/en_GB/LC_MESSAGES/gal-0.21.mo -share/locale/es/LC_MESSAGES/gal-0.21.mo -share/locale/eu/LC_MESSAGES/gal-0.21.mo -share/locale/fi/LC_MESSAGES/gal-0.21.mo -share/locale/fr/LC_MESSAGES/gal-0.21.mo -share/locale/gl/LC_MESSAGES/gal-0.21.mo -share/locale/hu/LC_MESSAGES/gal-0.21.mo -share/locale/it/LC_MESSAGES/gal-0.21.mo -share/locale/ja/LC_MESSAGES/gal-0.21.mo -share/locale/ko/LC_MESSAGES/gal-0.21.mo -share/locale/lt/LC_MESSAGES/gal-0.21.mo -share/locale/ms/LC_MESSAGES/gal-0.21.mo -share/locale/nn/LC_MESSAGES/gal-0.21.mo -share/locale/no/LC_MESSAGES/gal-0.21.mo -share/locale/pl/LC_MESSAGES/gal-0.21.mo -share/locale/pt/LC_MESSAGES/gal-0.21.mo -share/locale/pt_BR/LC_MESSAGES/gal-0.21.mo -share/locale/ro/LC_MESSAGES/gal-0.21.mo -share/locale/ru/LC_MESSAGES/gal-0.21.mo -share/locale/sk/LC_MESSAGES/gal-0.21.mo -share/locale/sv/LC_MESSAGES/gal-0.21.mo -share/locale/ta/LC_MESSAGES/gal-0.21.mo -share/locale/tr/LC_MESSAGES/gal-0.21.mo -share/locale/uk/LC_MESSAGES/gal-0.21.mo -share/locale/zh_CN/LC_MESSAGES/gal-0.21.mo -share/locale/zh_TW/LC_MESSAGES/gal-0.21.mo +share/etable/0.22/glade/e-table-config-no-group.glade +share/etable/0.22/glade/e-table-config.glade +share/etable/0.22/glade/e-table-field-chooser.glade +share/etable/0.22/glade/e-table-group.glade +share/gal/0.22/glade/e-categories-master-list-dialog.glade +share/gal/0.22/glade/gal-categories.glade +share/gal/0.22/glade/gal-define-views.glade +share/gal/0.22/glade/gal-view-instance-save-as-dialog.glade +share/gal/0.22/glade/gal-view-new-dialog.glade +share/gal/0.22/pixmaps/categories/category_birthday_16.png +share/gal/0.22/pixmaps/categories/category_business_16.png +share/gal/0.22/pixmaps/categories/category_favorites_16.png +share/gal/0.22/pixmaps/categories/category_gifts_16.png +share/gal/0.22/pixmaps/categories/category_goals_16.png +share/gal/0.22/pixmaps/categories/category_holiday-cards_16.png +share/gal/0.22/pixmaps/categories/category_holiday_16.png +share/gal/0.22/pixmaps/categories/category_hot-contacts_16.png +share/gal/0.22/pixmaps/categories/category_ideas_16.png +share/gal/0.22/pixmaps/categories/category_international_16.png +share/gal/0.22/pixmaps/categories/category_key-customer_16.png +share/gal/0.22/pixmaps/categories/category_miscellaneous_16.png +share/gal/0.22/pixmaps/categories/category_personal_16.png +share/gal/0.22/pixmaps/categories/category_phonecalls_16.png +share/gal/0.22/pixmaps/categories/category_status_16.png +share/gal/0.22/pixmaps/categories/category_strategies_16.png +share/gal/0.22/pixmaps/categories/category_suppliers_16.png +share/gal/0.22/pixmaps/categories/category_time-and-expenses_16.png +share/locale/az/LC_MESSAGES/gal-0.22.mo +share/locale/ca/LC_MESSAGES/gal-0.22.mo +share/locale/cs/LC_MESSAGES/gal-0.22.mo +share/locale/da/LC_MESSAGES/gal-0.22.mo +share/locale/de/LC_MESSAGES/gal-0.22.mo +share/locale/el/LC_MESSAGES/gal-0.22.mo +share/locale/en_GB/LC_MESSAGES/gal-0.22.mo +share/locale/es/LC_MESSAGES/gal-0.22.mo +share/locale/eu/LC_MESSAGES/gal-0.22.mo +share/locale/fi/LC_MESSAGES/gal-0.22.mo +share/locale/fr/LC_MESSAGES/gal-0.22.mo +share/locale/gl/LC_MESSAGES/gal-0.22.mo +share/locale/hu/LC_MESSAGES/gal-0.22.mo +share/locale/it/LC_MESSAGES/gal-0.22.mo +share/locale/ja/LC_MESSAGES/gal-0.22.mo +share/locale/ko/LC_MESSAGES/gal-0.22.mo +share/locale/lt/LC_MESSAGES/gal-0.22.mo +share/locale/ms/LC_MESSAGES/gal-0.22.mo +share/locale/nn/LC_MESSAGES/gal-0.22.mo +share/locale/no/LC_MESSAGES/gal-0.22.mo +share/locale/pl/LC_MESSAGES/gal-0.22.mo +share/locale/pt/LC_MESSAGES/gal-0.22.mo +share/locale/pt_BR/LC_MESSAGES/gal-0.22.mo +share/locale/ro/LC_MESSAGES/gal-0.22.mo +share/locale/ru/LC_MESSAGES/gal-0.22.mo +share/locale/sk/LC_MESSAGES/gal-0.22.mo +share/locale/sv/LC_MESSAGES/gal-0.22.mo +share/locale/ta/LC_MESSAGES/gal-0.22.mo +share/locale/tr/LC_MESSAGES/gal-0.22.mo +share/locale/uk/LC_MESSAGES/gal-0.22.mo +share/locale/zh_CN/LC_MESSAGES/gal-0.22.mo +share/locale/zh_TW/LC_MESSAGES/gal-0.22.mo %%SHARED%% @comment @dirrm share/locale/zh_TW/LC_MESSAGES @comment @dirrm share/locale/zh_TW @@ -272,13 +272,13 @@ share/locale/zh_TW/LC_MESSAGES/gal-0.21.mo @comment @dirrm share/locale/az/LC_MESSAGES @comment @dirrm share/locale/az @comment @dirrm share/locale -@dirrm share/gal/0.21/pixmaps/categories -@dirrm share/gal/0.21/pixmaps -@dirrm share/gal/0.21/glade -@dirrm share/gal/0.21 +@dirrm share/gal/0.22/pixmaps/categories +@dirrm share/gal/0.22/pixmaps +@dirrm share/gal/0.22/glade +@dirrm share/gal/0.22 @dirrm share/gal -@dirrm share/etable/0.21/glade -@dirrm share/etable/0.21 +@dirrm share/etable/0.22/glade +@dirrm share/etable/0.22 @dirrm share/etable @comment @exec mkdir -p %D/share/doc/gal/gal @comment @dirrm share/doc/gal/gal