diff options
author | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-15 02:04:19 +0000 |
---|---|---|
committer | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-15 02:04:19 +0000 |
commit | d45e163fdc30e7685bb5c4bc0b8de9000e7bb21a (patch) | |
tree | a5ca8f621a15ca69e2947c0b27553cb97d26d607 /x11/libgnome | |
parent | Update to version 1.4p4. (diff) |
* Update 1.0.1 -> 1.0.3.
* One file modified per patch in ${PATCHDIR}.
Notes
Notes:
svn path=/head/; revision=17211
Diffstat (limited to 'x11/libgnome')
-rw-r--r-- | x11/libgnome/Makefile | 6 | ||||
-rw-r--r-- | x11/libgnome/distinfo | 2 | ||||
-rw-r--r-- | x11/libgnome/files/patch-ba | 20 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bb | 20 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bc | 15 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bd | 29 | ||||
-rw-r--r-- | x11/libgnome/files/patch-be | 11 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bf | 20 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bg | 30 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bh | 11 | ||||
-rw-r--r-- | x11/libgnome/files/patch-bi | 38 | ||||
-rw-r--r-- | x11/libgnome/pkg-plist | 32 |
12 files changed, 215 insertions, 19 deletions
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 39dccdb790ba..a4e7ce511da7 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,11 +3,11 @@ # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ +# $Id: Makefile,v 1.33 1999/03/09 01:09:05 nectar Exp $ # -DISTNAME= gnome-libs-1.0.1 -PKGNAME= gnomelibs-1.0.1 +DISTNAME= gnome-libs-1.0.3 +PKGNAME= gnomelibs-1.0.3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= gnome-1.0/sources diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 455cc546ff06..c534e5cb8c8e 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f +MD5 (gnome-libs-1.0.3.tar.gz) = 5df86d279d58d366e5c7654661baab9b diff --git a/x11/libgnome/files/patch-ba b/x11/libgnome/files/patch-ba new file mode 100644 index 000000000000..9ffdf2f2cae4 --- /dev/null +++ b/x11/libgnome/files/patch-ba @@ -0,0 +1,20 @@ +--- Makefile.in.orig Tue Feb 16 01:08:51 1999 ++++ Makefile.in Fri Feb 19 00:21:10 1999 +@@ -160,7 +160,7 @@ + # just distribute it, since we can + @FALSE_TRUE@libvfs = libvfs + +-SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) ++SUBDIRS = po intl support macros tools images libart_lgpl libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt libgnorba idl $(test_gnome) gnome-data $(libvfs) + + + include_HEADERS = gnome.h +@@ -168,7 +168,7 @@ + EXTRA_DIST = HACKING gnomeConf.sh.in gnome-bug.in gnome-config.in gnome-libs.spec.in + + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = gnomeConf.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/x11/libgnome/files/patch-bb b/x11/libgnome/files/patch-bb new file mode 100644 index 000000000000..99123ff7272a --- /dev/null +++ b/x11/libgnome/files/patch-bb @@ -0,0 +1,20 @@ +--- gtk-xmhtml/Makefile.in.orig Tue Feb 16 01:09:23 1999 ++++ gtk-xmhtml/Makefile.in Fri Feb 19 00:20:20 1999 +@@ -148,7 +148,7 @@ + + libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml + +-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ -DWITH_GTK -DDEBUG -DGNOME_LIB ++INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ -DWITH_GTK -DGNOME_LIB + + + lib_LTLIBRARIES = libgtkxmhtml.la +@@ -460,7 +460,7 @@ + uninstall-am: uninstall-libLTLIBRARIES \ + uninstall-libgtkxmhtmlincludeHEADERS + uninstall: uninstall-am +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc new file mode 100644 index 000000000000..ee27eaca760f --- /dev/null +++ b/x11/libgnome/files/patch-bc @@ -0,0 +1,15 @@ +--- libgnome/Makefile.in.orig Tue Feb 16 01:09:10 1999 ++++ libgnome/Makefile.in Fri Feb 19 00:21:51 1999 +@@ -170,10 +170,10 @@ + + EXTRA_DIST = parse-path.cP + +-libgnome_la_LDFLAGS = -version-info 34:3:2 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 1:0:0 + libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) + +-bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb ++bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb + + + dns_helper_SOURCES = dns-helper.c diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd new file mode 100644 index 000000000000..49687fda740d --- /dev/null +++ b/x11/libgnome/files/patch-bd @@ -0,0 +1,29 @@ +--- libgnomeui/Makefile.in.orig Tue Feb 16 01:09:16 1999 ++++ libgnomeui/Makefile.in Fri Feb 19 00:26:03 1999 +@@ -200,7 +200,7 @@ + EXTRA_DIST = $(SGML) $(gtkrc_DATA) AUTHORS gnome.defs maketypes.awk makeenums.pl gnome-boxed.defs gnometypebuiltins_vars.c gnometypebuiltins_ids.c gnometypebuiltins_evals.c + + +-libgnomeui_la_LDFLAGS = -version-info 39:1:7 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 1:0:0 + libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) + + gnome_segv_LDADD = $(top_builddir)/libgnomeui/libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) +@@ -1468,7 +1468,7 @@ + check: check-recursive + installcheck-am: + installcheck: installcheck-recursive +-install-exec-am: install-libLTLIBRARIES install-binPROGRAMS ++install-exec-am: install-libLTLIBRARIES + install-exec: install-exec-recursive + + install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS +@@ -1480,7 +1480,7 @@ + uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \ + uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS + uninstall: uninstall-recursive +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) + all-redirect: all-recursive + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be new file mode 100644 index 000000000000..80e4c5ae33e9 --- /dev/null +++ b/x11/libgnome/files/patch-be @@ -0,0 +1,11 @@ +--- libgnorba/Makefile.in.orig Tue Feb 16 01:09:31 1999 ++++ libgnorba/Makefile.in Fri Feb 19 00:22:52 1999 +@@ -172,7 +172,7 @@ + libgnorbainclude_HEADERS = gnorba.h gnome-factory.h + + +-libgnorba_la_LDFLAGS = -version-info 28:4:1 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 1:0:0 + libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm + + loadshlib_SOURCES = loadshlib.c diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf new file mode 100644 index 000000000000..c41f89447f8e --- /dev/null +++ b/x11/libgnome/files/patch-bf @@ -0,0 +1,20 @@ +--- support/Makefile.in.orig Tue Feb 16 01:08:59 1999 ++++ support/Makefile.in Fri Feb 19 00:20:20 1999 +@@ -146,7 +146,7 @@ + mcserv = @mcserv@ + need_gnome_support = @need_gnome_support@ + +-supportincludedir = $(pkglibdir)/include ++supportincludedir = $(includedir) + + INCLUDES = -D_GNU_SOURCE + +@@ -171,7 +171,7 @@ + + libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c + libgnomesupport_la_LIBADD = @LTLIBOBJS@ +-libgnomesupport_la_LDFLAGS = -version-info 0:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 1:0:0 + + BUILT_SOURCES = gnomesupport.h + diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg new file mode 100644 index 000000000000..5f76201eec28 --- /dev/null +++ b/x11/libgnome/files/patch-bg @@ -0,0 +1,30 @@ +--- zvt/Makefile.in.orig Sun Feb 28 02:22:21 1999 ++++ zvt/Makefile.in Mon Mar 1 21:01:11 1999 +@@ -158,7 +158,7 @@ + libzvt_la_SOURCES = gnome-login-support.h gnome-login-support.c lists.c subshell.h subshell.c subshell-includes.h update.c vt.c zvtterm.c + + +-libzvt_la_LDFLAGS = -version-info 3:3:1 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir) + + libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h + +@@ -433,8 +433,7 @@ + check: check-am + installcheck-am: + installcheck: installcheck-am +-install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \ +- install-exec-local ++install-exec-am: install-libLTLIBRARIES + install-exec: install-exec-am + + install-data-am: install-libzvtincludeHEADERS +@@ -446,7 +445,7 @@ + uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \ + uninstall-libzvtincludeHEADERS + uninstall: uninstall-am +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(HEADERS) + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11/libgnome/files/patch-bh b/x11/libgnome/files/patch-bh new file mode 100644 index 000000000000..560ff0aa6c04 --- /dev/null +++ b/x11/libgnome/files/patch-bh @@ -0,0 +1,11 @@ +--- tools/Makefile.in.orig Tue Feb 16 01:09:02 1999 ++++ tools/Makefile.in Fri Feb 19 00:20:20 1999 +@@ -146,7 +146,7 @@ + mcserv = @mcserv@ + need_gnome_support = @need_gnome_support@ + +-SUBDIRS = convertrgb gnome-doc ++SUBDIRS = convertrgb + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi new file mode 100644 index 000000000000..8d49b031a833 --- /dev/null +++ b/x11/libgnome/files/patch-bi @@ -0,0 +1,38 @@ +--- libart_lgpl/Makefile.in.orig Tue Feb 16 01:09:07 1999 ++++ libart_lgpl/Makefile.in Fri Feb 19 00:20:20 1999 +@@ -94,7 +94,7 @@ + libart_lgpl_la_SOURCES = art_affine.c art_alphagamma.c art_bpath.c art_gray_svp.c art_misc.c art_pixbuf.c art_rect.c art_rect_svp.c art_rect_uta.c art_rgb.c art_rgb_affine.c art_rgb_affine_private.c art_rgb_affine_private.h art_rgb_bitmap_affine.c art_rgb_pixbuf_affine.c art_rgb_rgba_affine.c art_rgb_svp.c art_svp.c art_svp_ops.c art_svp_render_aa.c art_svp_vpath.c art_svp_vpath_stroke.c art_svp_wind.c art_svp_wind.h art_uta.c art_uta_ops.c art_uta_rect.c art_uta_vpath.c art_uta_svp.c art_vpath.c art_vpath_bpath.c art_vpath_svp.c + + +-libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ ++libart_lgpl_la_LDFLAGS = -version-info 1:0:0 + + libart_lgplincdir = $(includedir)/libart_lgpl + libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h +@@ -118,7 +118,7 @@ + m4datadir = $(datadir)/aclocal + m4data_DATA = libart.m4 + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = libartConf.sh + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +@@ -559,7 +559,7 @@ + install-confexecDATA + install-exec: install-exec-am + +-install-data-am: install-m4dataDATA install-libart_lgplincHEADERS ++install-data-am: install-libart_lgplincHEADERS + install-data: install-data-am + + install-am: all-am +@@ -569,7 +569,7 @@ + uninstall-confexecDATA uninstall-m4dataDATA \ + uninstall-libart_lgplincHEADERS + uninstall: uninstall-am +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ ++all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(DATA) \ + $(HEADERS) config.h + all-redirect: all-am + install-strip: diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 021e4eabd18b..4d9d72ec2765 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -16,6 +16,8 @@ etc/mime-magic.dat etc/paper.config etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist +@dirrm etc/sound/events +@dirrm etc/sound include/gnome.h include/gnomesupport.h include/gtk-xmhtml/HTML.h @@ -26,6 +28,7 @@ include/gtk-xmhtml/gtk-xmhtml-p.h include/gtk-xmhtml/gtk-xmhtml.h include/gtk-xmhtml/miniparse.h include/gtk-xmhtml/toolkit.h +@dirrm include/gtk-xmhtml include/libart_lgpl/art_affine.h include/libart_lgpl/art_alphagamma.h include/libart_lgpl/art_bpath.h @@ -57,6 +60,7 @@ include/libart_lgpl/art_uta_vpath.h include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_svp.h +@dirrm include/libart_lgpl include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -79,6 +83,7 @@ include/libgnome/gnome-triggers.h include/libgnome/gnome-url.h include/libgnome/gnome-util.h include/libgnome/libgnome.h +@dirrm include/libgnome include/libgnomeui/gnome-about.h include/libgnomeui/gnome-animator.h include/libgnomeui/gnome-app-helper.h @@ -151,13 +156,16 @@ include/libgnomeui/gtkcauldron.h include/libgnomeui/gtkdial.h include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h +@dirrm include/libgnomeui include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +@dirrm include/libgnorba include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h include/zvt/zvtterm.h +@dirrm include/zvt lib/libart_lgpl.a lib/libart_lgpl.la lib/libart_lgpl.so @@ -192,15 +200,21 @@ lib/libzvt.so lib/libzvt.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@exec mkdir -p %D/share/gnome/games +@dirrm share/gnome/games share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko share/gnome/gtkrc.ru +share/gnome/idl/GnomeObject.idl share/gnome/idl/Table.idl share/gnome/idl/base.idl +share/gnome/idl/gnome-editor.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl +@dirrm share/gnome/idl share/gnome/mime-info/gnome.mime +@dirrm share/gnome/mime-info share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png share/gnome/pixmaps/gnome-error.png @@ -209,9 +223,12 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +@dirrm share/gnome/pixmaps share/gnome/type-convert/gnome-make-postscript-mimes share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert +@dirrm share/gnome/type-convert +@dirrm share/gnome share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo share/locale/da/LC_MESSAGES/gnome-libs.mo @@ -230,18 +247,3 @@ share/locale/pl/LC_MESSAGES/gnome-libs.mo share/locale/pt/LC_MESSAGES/gnome-libs.mo share/locale/ru/LC_MESSAGES/gnome-libs.mo share/locale/sv/LC_MESSAGES/gnome-libs.mo -@exec mkdir -p %D/share/gnome/games -@dirrm share/gnome/type-convert -@dirrm share/gnome/pixmaps -@dirrm share/gnome/mime-info -@dirrm share/gnome/idl -@dirrm share/gnome/games -@dirrm share/gnome -@dirrm include/zvt -@dirrm include/libgnorba -@dirrm include/libgnomeui -@dirrm include/libgnome -@dirrm include/libart_lgpl -@dirrm include/gtk-xmhtml -@dirrm etc/sound/events -@dirrm etc/sound |