Date: Thu, 6 Sep 2001 21:43:08 +0300 (EEST) From: Maxim Sobolev <sobomax@FreeBSD.org> To: gnome@FreeBSD.org Cc: ports@FreeBSD.org Subject: Several updates for testing [patch] Message-ID: <200109061843.f86Ih8u16774@vega.vega.com>
next in thread | raw e-mail | index | archive | help
--%--multipart-mixed-boundary-1.16759.999801788--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi folks,
Attached please find several updates to core GNOME components, which should
bring our metaport on par with GNOME Fifth-Toe 1.4.1b2. I would like to ask
people with spare CPU cycles to test these patches and report any problem.
Thanks!
-Maxim
--%--multipart-mixed-boundary-1.16759.999801788--%
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Description: ASCII English text
Content-Disposition: attachment; filename="gnome.diff"
? gtkhtml/pkg-plist,v
? oaf/pkg-plist,v
Index: gtkhtml/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml/Makefile,v
retrieving revision 1.32
diff -d -u -r1.32 Makefile
--- gtkhtml/Makefile 2001/08/26 01:48:22 1.32
+++ gtkhtml/Makefile 2001/09/06 18:39:51
@@ -6,7 +6,7 @@
#
PORTNAME= gtkhtml
-PORTVERSION= 0.11.1
+PORTVERSION= 0.12.0
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/gtkhtml
Index: gtkhtml/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml/distinfo,v
retrieving revision 1.10
diff -d -u -r1.10 distinfo
--- gtkhtml/distinfo 2001/08/03 07:26:43 1.10
+++ gtkhtml/distinfo 2001/09/06 18:39:51
@@ -1 +1 @@
-MD5 (gtkhtml-0.11.1.tar.gz) = 99e30cd858a816d57b815755ff199bc3
+MD5 (gtkhtml-0.12.0.tar.gz) = 7f456758bb635669e6eb576b7e02361c
Index: gtkhtml/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/www/gtkhtml/pkg-plist,v
retrieving revision 1.12
diff -d -u -r1.12 pkg-plist
--- gtkhtml/pkg-plist 2001/08/03 07:26:43 1.12
+++ gtkhtml/pkg-plist 2001/09/06 18:39:51
@@ -93,7 +93,7 @@
lib/bonobo/plugin/libstorage_http.so
lib/libgtkhtml.a
lib/libgtkhtml.so
-lib/libgtkhtml.so.14
+lib/libgtkhtml.so.15
share/gnome/apps/Settings/Documents/gtkhtml-properties.desktop
share/gnome/control-center/Documents/gtkhtml-properties.desktop
share/gnome/control-center/capplets/gtkhtml-properties.desktop
@@ -107,17 +107,34 @@
share/gnome/gtkhtml/icons/24_cut.png
share/gnome/gtkhtml/icons/24_paste.png
share/gnome/gtkhtml/icons/bulb.png
+share/gnome/gtkhtml/icons/empty_image.png
+share/gnome/gtkhtml/icons/flowers.png
share/gnome/gtkhtml/icons/html-viewer.png
share/gnome/gtkhtml/icons/insert-image-16.png
share/gnome/gtkhtml/icons/insert-image-24.png
share/gnome/gtkhtml/icons/insert-link-16.png
share/gnome/gtkhtml/icons/insert-link-24.png
+share/gnome/gtkhtml/icons/insert-object-16.png
+share/gnome/gtkhtml/icons/insert-object-24.png
share/gnome/gtkhtml/icons/insert-rule-16.png
share/gnome/gtkhtml/icons/insert-rule-24.png
share/gnome/gtkhtml/icons/insert-table-16.png
share/gnome/gtkhtml/icons/insert-table-24.png
+share/gnome/gtkhtml/icons/redo-16.png
+share/gnome/gtkhtml/icons/redo-24.png
+share/gnome/gtkhtml/icons/rule-blue-center.png
+share/gnome/gtkhtml/icons/rule-blue-left.png
+share/gnome/gtkhtml/icons/rule-blue-right.png
+share/gnome/gtkhtml/icons/rule-yellow-flowers-center.png
+share/gnome/gtkhtml/icons/rule-yellow-flowers-left.png
+share/gnome/gtkhtml/icons/rule-yellow-flowers-right.png
+share/gnome/gtkhtml/icons/search-16.png
share/gnome/gtkhtml/icons/search-24.png
+share/gnome/gtkhtml/icons/search-and-replace-16.png
share/gnome/gtkhtml/icons/search-and-replace-24.png
+share/gnome/gtkhtml/icons/transparent.png
+share/gnome/gtkhtml/icons/undo-16.png
+share/gnome/gtkhtml/icons/undo-24.png
share/gnome/gtkhtml/keybindingsrc.emacs
share/gnome/gtkhtml/keybindingsrc.ms
share/gnome/gtkhtml/keybindingsrc.xemacs
@@ -126,14 +143,6 @@
share/gnome/html/gtkhtml.hierarchy
share/gnome/html/gtkhtml.sgml
share/gnome/html/gtkhtml.types
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-enums.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-stream.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtml-types.html
-share/gnome/html/gtkhtml/gtkhtml-gtkhtmlembedded.html
-share/gnome/html/gtkhtml/gtkhtml.html
-share/gnome/html/gtkhtml/index.html
-share/gnome/html/gtkhtml/license.html
-share/gnome/html/gtkhtml/r27.html
share/gnome/oaf/GNOME_GtkHTML_EBrowser.oaf
share/gnome/oaf/GNOME_GtkHTML_Editor.oaf
share/gnome/ui/GNOME_GtkHTML_Editor.xml
Index: oaf/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/oaf/Makefile,v
retrieving revision 1.14
diff -d -u -r1.14 Makefile
--- oaf/Makefile 2001/09/04 12:15:10 1.14
+++ oaf/Makefile 2001/09/06 18:39:51
@@ -6,11 +6,10 @@
#
PORTNAME= oaf
-PORTVERSION= 0.6.5
-PORTREVISION= 1
+PORTVERSION= 0.6.6
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= unstable/sources/oaf
+MASTER_SITE_SUBDIR= stable/sources/oaf
MAINTAINER= gnome@FreeBSD.org
@@ -19,7 +18,7 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GLIB= yes
-USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GNOMELIBS= yes
CONFIGURE_ARGS= --enable-static --enable-shared \
@@ -30,7 +29,7 @@
pre-patch:
@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
- @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
Index: oaf/distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/oaf/distinfo,v
retrieving revision 1.7
diff -d -u -r1.7 distinfo
--- oaf/distinfo 2001/05/04 21:39:35 1.7
+++ oaf/distinfo 2001/09/06 18:39:51
@@ -1 +1 @@
-MD5 (oaf-0.6.5.tar.gz) = 23bfa9046d8d745d7cd17ad75fb08aed
+MD5 (oaf-0.6.6.tar.gz) = ae0150ee506d8b9a9f7b7edd7e1b87f4
Index: oaf/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/oaf/pkg-plist,v
retrieving revision 1.9
diff -d -u -r1.9 pkg-plist
--- oaf/pkg-plist 2001/05/04 21:39:35 1.9
+++ oaf/pkg-plist 2001/09/06 18:39:51
@@ -1,5 +1,6 @@
bin/oaf-client
bin/oaf-config
+bin/oaf-empty-server
bin/oaf-run-query
bin/oaf-slay
bin/oaf-sysconf
@@ -39,6 +40,7 @@
share/locale/it/LC_MESSAGES/oaf.mo
share/locale/ja/LC_MESSAGES/oaf.mo
share/locale/ko/LC_MESSAGES/oaf.mo
+share/locale/nn/LC_MESSAGES/oaf.mo
share/locale/no/LC_MESSAGES/oaf.mo
share/locale/pl/LC_MESSAGES/oaf.mo
share/locale/pt_BR/LC_MESSAGES/oaf.mo
@@ -47,8 +49,10 @@
share/locale/sk/LC_MESSAGES/oaf.mo
share/locale/sl/LC_MESSAGES/oaf.mo
share/locale/sv/LC_MESSAGES/oaf.mo
+share/locale/ta/LC_MESSAGES/oaf.mo
share/locale/tr/LC_MESSAGES/oaf.mo
share/locale/uk/LC_MESSAGES/oaf.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/oaf.mo
@dirrm share/gnome/oaf/html/liboaf
@dirrm share/gnome/oaf/html
@unexec rmdir %D/share/gnome/oaf 2>/dev/null || true
Index: oaf/files/patch-liboaf::oaf-fork-server.c
===================================================================
RCS file: patch-liboaf::oaf-fork-server.c
diff -N patch-liboaf::oaf-fork-server.c
--- /dev/null Thu Sep 6 11:23:45 2001
+++ patch-liboaf::oaf-fork-server.c Thu Sep 6 11:39:51 2001
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- liboaf/oaf-fork-server.c 2001/09/06 07:05:36 1.1
++++ liboaf/oaf-fork-server.c 2001/09/06 07:06:12
+@@ -267,6 +267,7 @@
+ if (od_iorstr)
+ oaf_setenv ("OAF_OD_IOR", od_iorstr);
+
++ sigprocmask (SIG_SETMASK, &omask, NULL);
+
+ close (iopipes[0]);
+
Index: oaf/files/patch-liboaf::oaf-registration.c
===================================================================
RCS file: patch-liboaf::oaf-registration.c
diff -N patch-liboaf::oaf-registration.c
--- /tmp/cvsAcii8eUJVJ Thu Sep 6 11:39:52 2001
+++ /dev/null Thu Sep 6 11:23:45 2001
@@ -1,13 +0,0 @@
-
-$FreeBSD: ports/devel/oaf/files/patch-liboaf::oaf-registration.c,v 1.1 2001/09/04 12:15:10 sobomax Exp $
-
---- liboaf/oaf-registration.c 2001/09/04 11:05:52 1.1
-+++ liboaf/oaf-registration.c 2001/09/04 11:06:15
-@@ -395,6 +395,7 @@
- if (od_iorstr)
- oaf_setenv ("OAF_OD_IOR", od_iorstr);
-
-+ sigprocmask (SIG_SETMASK, &omask, NULL);
-
- close (iopipes[0]);
-
Index: oaf/files/patch-ltmain.sh
===================================================================
RCS file: patch-ltmain.sh
diff -N patch-ltmain.sh
--- /dev/null Thu Sep 6 11:23:45 2001
+++ patch-ltmain.sh Thu Sep 6 11:39:51 2001
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- ltmain.sh 2001/08/27 09:51:26 1.1
++++ ltmain.sh 2001/08/27 09:51:42
+@@ -4175,10 +4175,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"
Index: gnomecore/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/gnomecore/Makefile,v
retrieving revision 1.64
diff -d -u -r1.64 Makefile
--- gnomecore/Makefile 2001/08/03 07:27:39 1.64
+++ gnomecore/Makefile 2001/09/06 18:39:51
@@ -15,7 +15,7 @@
MAINTAINER?= gnome@FreeBSD.org
-LIB_DEPENDS= gtkhtml.14:${PORTSDIR}/www/gtkhtml
+LIB_DEPENDS= gtkhtml.15:${PORTSDIR}/www/gtkhtml
RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio
USE_X_PREFIX= yes
--%--multipart-mixed-boundary-1.16759.999801788--%--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200109061843.f86Ih8u16774>