diff options
Diffstat (limited to '')
73 files changed, 1569 insertions, 1549 deletions
diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index bf2960bd66c2..df1ef6181c4c 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomemc -# Version required: 4.5.10 +# Version required: 4.5.23 # Date created: 26 Jnuary 1999 # Whom: Jeremy Lea <reg@shale.csir.co.za> # -# $Id: Makefile,v 1.1.1.1 1999/01/31 20:57:11 vanilla Exp $ +# $Id: Makefile,v 1.2 1999/02/12 02:33:17 asami Exp $ # -DISTNAME= mc-4.5.10 -PKGNAME= gnomemc-4.5.10 +DISTNAME= mc-4.5.23 +PKGNAME= gnomemc-4.5.23 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= mc +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= reg@shale.csir.co.za @@ -18,7 +18,7 @@ BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore # implicit dependencies: -# gettext, glib11-devel, xpm, gnomelibs +# gettext, glib12, xpm, gnomelibs USE_X_PREFIX= yes USE_GMAKE= yes @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --without-edit -with-ncurses CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ MAKE="gmake" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" .include <bsd.port.mk> diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo index 94bf014f4230..ec42a95ab3db 100644 --- a/x11-fm/gnomemc/distinfo +++ b/x11-fm/gnomemc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.10.tar.gz) = 13d941d11913d18b05a71df45d5d86ed +MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318 diff --git a/x11-fm/gnomemc/files/patch-aa b/x11-fm/gnomemc/files/patch-aa index 9fea13f95ff6..11938f5c31bb 100644 --- a/x11-fm/gnomemc/files/patch-aa +++ b/x11-fm/gnomemc/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Wed Jan 27 00:01:05 1999 -+++ configure Wed Jan 27 00:01:25 1999 -@@ -3188,15 +3188,15 @@ +--- configure.orig Tue Feb 16 05:58:53 1999 ++++ configure Tue Feb 23 00:58:48 1999 +@@ -3269,15 +3269,15 @@ fi @@ -22,7 +22,7 @@ fi if test "$XGETTEXT" != ":"; then -@@ -10362,7 +10362,7 @@ +@@ -10553,7 +10553,7 @@ if test -f /usr/include/ncurses.h then echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6 @@ -31,12 +31,12 @@ CURSES_INCLUDEDIR="" search_ncurses=false screen_manager="ncurses on /usr/include" -@@ -10676,6 +10676,8 @@ - fi - done +@@ -10681,6 +10681,8 @@ + fi + fi +CFLAGS="$CFLAGS $CURSES_INCLUDEDIR" +LIBS="$LIBS $CURSES_LIBS" - if test "x$screen_manager" = "xunknown"; then - cat >> confdefs.h <<\EOF + if $search_ncurses + then diff --git a/x11-fm/gnomemc/files/patch-ac b/x11-fm/gnomemc/files/patch-ac index 92961fd24cb7..f76939585b40 100644 --- a/x11-fm/gnomemc/files/patch-ac +++ b/x11-fm/gnomemc/files/patch-ac @@ -1,22 +1,24 @@ ---- Make.common.in.orig Tue Jan 26 22:36:55 1999 -+++ Make.common.in Tue Jan 26 22:40:12 1999 -@@ -19,15 +19,15 @@ +--- Make.common.in.orig Thu Feb 25 08:53:30 1999 ++++ Make.common.in Thu Feb 25 18:29:33 1999 +@@ -19,17 +19,17 @@ bindir = @bindir@ sysconfdir = @sysconfdir@ corbadir = $(sysconfdir)/CORBA/servers -libdir = $(exec_prefix)/lib/mc -+libdir = @localstatedir@/mc -idldir = $(prefix)/share/idl ++libdir = @localstatedir@/mc +idldir = @localstatedir@/idl suppbindir = $(libdir)/bin -gnewdir = $(prefix)/share/mc/templates +gnewdir = $(libdir)/templates tidir = $(libdir)/term extfsdir = $(libdir)/extfs + confdir = $(prefix)/etc datadir = @datadir@ icondir = $(datadir)/pixmaps/mc + gnomeicondir = @gnomeicondir@ -localedir = $(datadir)/locale +localedir = $(prefix)/share/locale - basemandir = @mandir@ - mandir = $(basemandir)/man1 + mandir = @mandir@ + man1dir = $(mandir)/man1 manext = 1 diff --git a/x11-fm/gnomemc/files/patch-ad b/x11-fm/gnomemc/files/patch-ad index 1074809019fc..694c000fe771 100644 --- a/x11-fm/gnomemc/files/patch-ad +++ b/x11-fm/gnomemc/files/patch-ad @@ -1,11 +1,11 @@ ---- gnome/gtools.c.orig Tue Feb 2 16:10:31 1999 -+++ gnome/gtools.c Tue Feb 2 16:10:41 1999 -@@ -4,7 +4,7 @@ - * Written by Miguel de Icaza - */ - #include <config.h> +--- gnome/gtools.c.orig Tue Feb 16 01:29:19 1999 ++++ gnome/gtools.c Fri Feb 19 01:43:53 1999 +@@ -13,7 +13,7 @@ + #undef HAVE_LIBGPM + #include "mouse.h" + #include "key.h" -#include "myslang.h" +#include "tty.h" - #include <gnome.h> - #include <gdk/gdkkeysyms.h> - #include <string.h> + #include "widget.h" + #include "wtools.h" + #include "dialog.h" diff --git a/x11-fm/gnomemc/files/patch-af b/x11-fm/gnomemc/files/patch-af index 59c51acbece7..0399494979c3 100644 --- a/x11-fm/gnomemc/files/patch-af +++ b/x11-fm/gnomemc/files/patch-af @@ -1,5 +1,5 @@ ---- Makefile.in.orig Tue Jan 26 19:51:29 1999 -+++ Makefile.in Tue Jan 26 19:54:31 1999 +--- Makefile.in.orig Tue Feb 16 01:29:07 1999 ++++ Makefile.in Fri Feb 19 01:45:58 1999 @@ -5,7 +5,7 @@ @MCFGR@@MCF@ @@ -10,7 +10,7 @@ alldirs=$(unixdirs) $(foreigndirs) subdirs=$(alldirs) @@ -46,8 +46,6 @@ - install: installdirs @vcs@ + install: installdirs @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ - $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install @@ -20,21 +20,21 @@ @@ -58,12 +56,9 @@ installdirs: - $(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) - $(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) -- $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) -- $(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) -+ $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) -+ $(mcsrcdir)/xmkdir $(DESTDIR)$(extfsdir) - $(mcsrcdir)/xmkdir $(DESTDIR)$(idldir) + $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir) + $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir) +- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir) +- $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(icondir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(extfsdir) + $(MKINSTALLDIRS) $(DESTDIR)$(idldir) - -mcfninstall: - -/bin/sh ./mcfn_install uninstall: @for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done ---- lib/Makefile.in.orig Tue Jan 19 00:44:08 1999 -+++ lib/Makefile.in Thu Jan 28 15:45:04 1999 +--- lib/Makefile.in.orig Mon Mar 1 03:38:13 1999 ++++ lib/Makefile.in Mon Mar 1 14:43:56 1999 @@ -15,7 +15,6 @@ LIBFILES_IN = mc.ext.in mc-gnome.ext.in LIBFILES_OUT = mc.ext mc-gnome.ext @@ -42,13 +42,13 @@ -TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \ Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \ - mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.menu.qnx.diff -@@ -42,8 +41,6 @@ + mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.global +@@ -45,8 +44,6 @@ do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done for I in $(LIBFILES_OUT); \ do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done - for I in $(TIFILES); \ - do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done + $(MKINSTALLDIRS) $(DESTDIR)$(confdir) + $(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir) - uninstall: - for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \ diff --git a/x11-fm/gnomemc/files/patch-ag b/x11-fm/gnomemc/files/patch-ag index db4fed21727d..1ac4e786f4de 100644 --- a/x11-fm/gnomemc/files/patch-ag +++ b/x11-fm/gnomemc/files/patch-ag @@ -164,14 +164,14 @@ # Sound files shell/.mod ---- gnome/mc.keys.in.in.orig Tue Jan 19 00:44:12 1999 -+++ gnome/mc.keys.in.in Thu Jan 28 11:54:32 1999 -@@ -86,7 +86,7 @@ +--- gnome/mc.keys.in.in.orig Tue Feb 16 01:29:18 1999 ++++ gnome/mc.keys.in.in Fri Feb 19 01:47:31 1999 +@@ -96,7 +96,7 @@ icon-filename=@icondir@/tex.xpm application/postscript: - open=gv %f + open=ggv %f - icon-filename=@icondir@/postscript.xpm + icon-filename=@icondir@/gnome-application-postscript.png application/x-object-file: diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist index 3dae830e85ca..86bbf86b6a24 100644 --- a/x11-fm/gnomemc/pkg-plist +++ b/x11-fm/gnomemc/pkg-plist @@ -1,6 +1,7 @@ bin/gmc bin/plain-gmc etc/CORBA/servers/gmc.gnorba +etc/mc.global share/gnome/idl/FileManager.idl share/gnome/idl/Makefile.in share/gnome/mc/FAQ @@ -29,16 +30,16 @@ share/gnome/mc/mc.ext share/gnome/mc/mc.hint share/gnome/mc/mc.lib share/gnome/mc/mc.menu -share/gnome/mc/templates/GIMP.desktop share/gnome/mime-info/mc.keys -share/gnome/pixmaps/mc/c.xpm -share/gnome/pixmaps/mc/calendar.xpm -share/gnome/pixmaps/mc/cc.xpm -share/gnome/pixmaps/mc/compressed.xpm share/gnome/pixmaps/mc/directory.xpm +share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png +share/gnome/pixmaps/mc/gnome-application-postscript.png share/gnome/pixmaps/mc/gnome-application-x-c-header.png share/gnome/pixmaps/mc/gnome-application-x-c-source.png share/gnome/pixmaps/mc/gnome-application-x-cc-source.png +share/gnome/pixmaps/mc/gnome-audio.png +share/gnome/pixmaps/mc/gnome-compressed.png +share/gnome/pixmaps/mc/gnome-core.png share/gnome/pixmaps/mc/gnome-http-url.png share/gnome/pixmaps/mc/gnome-image-bmp.png share/gnome/pixmaps/mc/gnome-image-generic.png @@ -50,41 +51,45 @@ share/gnome/pixmaps/mc/gnome-image-pgm.png share/gnome/pixmaps/mc/gnome-image-png.png share/gnome/pixmaps/mc/gnome-image-pnm.png share/gnome/pixmaps/mc/gnome-image-ppm.png +share/gnome/pixmaps/mc/gnome-image-psd.png share/gnome/pixmaps/mc/gnome-image-ras.png share/gnome/pixmaps/mc/gnome-image-rgb.png share/gnome/pixmaps/mc/gnome-image-tga.png share/gnome/pixmaps/mc/gnome-image-tiff.png share/gnome/pixmaps/mc/gnome-image-xbm.png +share/gnome/pixmaps/mc/gnome-image-xcf.png share/gnome/pixmaps/mc/gnome-image-xpm.png share/gnome/pixmaps/mc/gnome-image-xwd.png +share/gnome/pixmaps/mc/gnome-manpage.png +share/gnome/pixmaps/mc/gnome-objectfile.png share/gnome/pixmaps/mc/gnome-pack-deb.png share/gnome/pixmaps/mc/gnome-pack-rpm.png +share/gnome/pixmaps/mc/gnome-package.png +share/gnome/pixmaps/mc/gnome-tex.png share/gnome/pixmaps/mc/gnome-text-html.png +share/gnome/pixmaps/mc/gnome-textfile.png share/gnome/pixmaps/mc/gnome-video-mpeg.png share/gnome/pixmaps/mc/gnome-video-quicktime.png share/gnome/pixmaps/mc/gnome-video-x-msvideo.png -share/gnome/pixmaps/mc/h.xpm -share/gnome/pixmaps/mc/html.xpm share/gnome/pixmaps/mc/i-blockdev.png +share/gnome/pixmaps/mc/i-cdrom.png share/gnome/pixmaps/mc/i-chardev.png share/gnome/pixmaps/mc/i-core.png share/gnome/pixmaps/mc/i-dirclosed.png share/gnome/pixmaps/mc/i-directory.png share/gnome/pixmaps/mc/i-executable.png +share/gnome/pixmaps/mc/i-fifo.png +share/gnome/pixmaps/mc/i-floppy.png +share/gnome/pixmaps/mc/i-printer.png share/gnome/pixmaps/mc/i-regular.png share/gnome/pixmaps/mc/i-sock.png share/gnome/pixmaps/mc/i-stalled.png share/gnome/pixmaps/mc/i-symlink.png share/gnome/pixmaps/mc/makefile.xpm -share/gnome/pixmaps/mc/man.xpm -share/gnome/pixmaps/mc/o.xpm -share/gnome/pixmaps/mc/postscript.xpm share/gnome/pixmaps/mc/sound.xpm -share/gnome/pixmaps/mc/tex.xpm -share/gnome/pixmaps/mc/text.xpm share/gnome/pixmaps/mc/trash.xpm -share/gnome/pixmaps/mc/word.xpm -share/gnome/pixmaps/mc/zip.xpm +share/locale/cs/LC_MESSAGES/mc.mo +share/locale/da/LC_MESSAGES/mc.mo share/locale/de/LC_MESSAGES/mc.mo share/locale/es/LC_MESSAGES/mc.mo share/locale/fr/LC_MESSAGES/mc.mo @@ -95,5 +100,3 @@ share/locale/pl/LC_MESSAGES/mc.mo share/locale/ru/LC_MESSAGES/mc.mo @dirrm share/gnome/pixmaps/mc @dirrm share/gnome/mc/extfs -@dirrm share/gnome/mc/templates -@dirrm share/gnome/mc diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-themes/gtk-engines/Makefile +++ b/x11-themes/gtk-engines/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-themes/gtk-engines/distinfo b/x11-themes/gtk-engines/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-themes/gtk-engines/distinfo +++ b/x11-themes/gtk-engines/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-themes/gtk-engines/files/patch-ac b/x11-themes/gtk-engines/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-themes/gtk-engines/files/patch-ac +++ b/x11-themes/gtk-engines/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-themes/gtk-engines/pkg-plist b/x11-themes/gtk-engines/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-themes/gtk-engines/pkg-plist +++ b/x11-themes/gtk-engines/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-themes/gtk-engines2/distinfo b/x11-themes/gtk-engines2/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-themes/gtk-engines2/distinfo +++ b/x11-themes/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-themes/gtk-engines2/files/patch-ac b/x11-themes/gtk-engines2/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-themes/gtk-engines2/files/patch-ac +++ b/x11-themes/gtk-engines2/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-themes/gtk-engines2/pkg-plist b/x11-themes/gtk-engines2/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-themes/gtk-engines2/pkg-plist +++ b/x11-themes/gtk-engines2/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index e195699f8539..f1c6192832fd 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.20 1999/02/23 08:15:54 asami Exp $ +# $Id: Makefile,v 1.21 1999/03/07 23:53:37 billf Exp $ # SUBDIR += FWF @@ -12,6 +12,7 @@ SUBDIR += gtk10 SUBDIR += gtk11 SUBDIR += gtk11-devel + SUBDIR += gtk12 SUBDIR += gtkgl SUBDIR += gtkstep SUBDIR += iv diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-toolkits/gtk-engines/Makefile +++ b/x11-toolkits/gtk-engines/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines/distinfo b/x11-toolkits/gtk-engines/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-toolkits/gtk-engines/distinfo +++ b/x11-toolkits/gtk-engines/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-toolkits/gtk-engines/files/patch-ac b/x11-toolkits/gtk-engines/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-toolkits/gtk-engines/files/patch-ac +++ b/x11-toolkits/gtk-engines/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-toolkits/gtk-engines/pkg-plist b/x11-toolkits/gtk-engines/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-toolkits/gtk-engines/pkg-plist +++ b/x11-toolkits/gtk-engines/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile index 964fa2dc0162..85eb8e486975 100644 --- a/x11-toolkits/gtk-engines2/Makefile +++ b/x11-toolkits/gtk-engines2/Makefile @@ -1,15 +1,15 @@ # New ports collection makefile for: gtk-engines -# Version required: 0.1 +# Version required: 0.5 # Date Created: 23 Dec 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.6 1999/01/31 16:59:44 vanilla Exp $ +# $Id: Makefile,v 1.7 1999/02/02 17:01:42 vanilla Exp $ # -DISTNAME= gtk-engines-0.1 +DISTNAME= gtk-engines-0.5 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gtk-engines +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= vanilla@FreeBSD.ORG @@ -17,7 +17,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk11d-config" +CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" THEMES= metal notif pixmap redmond95 diff --git a/x11-toolkits/gtk-engines2/distinfo b/x11-toolkits/gtk-engines2/distinfo index e4277adf718d..391eac03b46e 100644 --- a/x11-toolkits/gtk-engines2/distinfo +++ b/x11-toolkits/gtk-engines2/distinfo @@ -1 +1 @@ -MD5 (gtk-engines-0.1.tar.gz) = 6bef05647b2a7fcb20987f9f0e0b3306 +MD5 (gtk-engines-0.5.tar.gz) = fbd20c48f8d070fa3a7044347a4ed684 diff --git a/x11-toolkits/gtk-engines2/files/patch-ac b/x11-toolkits/gtk-engines2/files/patch-ac index 804b3532ab0b..c4b32a6f7250 100644 --- a/x11-toolkits/gtk-engines2/files/patch-ac +++ b/x11-toolkits/gtk-engines2/files/patch-ac @@ -1,17 +1,13 @@ ---- metal/Theme/gtk/gtkrc.orig Sun Jan 31 03:04:18 1999 -+++ metal/Theme/gtk/gtkrc Sun Jan 31 03:11:48 1999 -@@ -13,9 +13,9 @@ - # testgtkrc2 sets all the buttons in the main window to blue by default - #include "testgtkrc2" - --#module_path ".:/home/raster/themes" +--- metal/Theme/gtk/gtkrc.orig Fri Feb 12 05:16:41 1999 ++++ metal/Theme/gtk/gtkrc Wed Feb 17 01:23:21 1999 +@@ -1,3 +1,7 @@ +#module_path "%%PREFIX%%/share/themes" - --pixmap_path "." ++ +pixmap_path "%%PREFIX%%/share/themes/Metal/gtk" - ++ style "default" { + font = "-b&h-lucida-bold-r-normal-sans-12-*-*-*-p-*-iso8859-1" --- notif/Theme/gtk/gtkrc.orig Sun Jan 31 03:05:48 1999 +++ notif/Theme/gtk/gtkrc Sun Jan 31 03:11:41 1999 @@ -13,9 +13,9 @@ diff --git a/x11-toolkits/gtk-engines2/pkg-plist b/x11-toolkits/gtk-engines2/pkg-plist index 030f5aa1656c..2d5af587e9c4 100644 --- a/x11-toolkits/gtk-engines2/pkg-plist +++ b/x11-toolkits/gtk-engines2/pkg-plist @@ -79,19 +79,15 @@ share/themes/Pixmap/gtk/vline.png share/themes/Redmond95/ICON.png share/themes/Redmond95/README.html share/themes/Redmond95/gtk/gtkrc -share/themes/engines/libmetal.a share/themes/engines/libmetal.la share/themes/engines/libmetal.so share/themes/engines/libmetal.so.0 -share/themes/engines/libnotif.a share/themes/engines/libnotif.la share/themes/engines/libnotif.so share/themes/engines/libnotif.so.0 -share/themes/engines/libpixmap.a share/themes/engines/libpixmap.la share/themes/engines/libpixmap.so share/themes/engines/libpixmap.so.0 -share/themes/engines/libredmond95.a share/themes/engines/libredmond95.la share/themes/engines/libredmond95.so share/themes/engines/libredmond95.so.0 diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk12/distinfo +++ b/x11-toolkits/gtk12/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa index 89e094d9c3bf..bea450001131 100644 --- a/x11-toolkits/gtk12/files/patch-aa +++ b/x11-toolkits/gtk12/files/patch-aa @@ -1,207 +1,170 @@ --- Makefile.in.orig Sun Jan 31 23:26:39 1999 +++ Makefile.in Sun Jan 31 23:31:06 1999 -@@ -124,7 +124,7 @@ +@@ -126,7 +126,7 @@ SRC_SUBDIRS = gdk gtk SUBDIRS = po $(SRC_SUBDIRS) docs -bin_SCRIPTS = gtk-config -+bin_SCRIPTS = gtk11d-config ++bin_SCRIPTS = gtk12-config - EXTRA_DIST = HACKING gtk+.spec gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/menufactory.c examples/menu/menufactory.h examples/menu/mfmain.c examples/menu/mfmain.h examples/notebook/Makefile examples/notebook/notebook.c examples/packer/Makefile examples/packer/pack.c examples/packbox/Makefile examples/packbox/packbox.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/find-examples.sh + EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/gcalendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh -@@ -134,7 +134,7 @@ +@@ -136,7 +136,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = gtk-config -+CONFIG_CLEAN_FILES = gtk11d-config +-CONFIG_CLEAN_FILES = gtk+.spec gtk-config ++CONFIG_CLEAN_FILES = gtk-config SCRIPTS = $(bin_SCRIPTS) DATA = $(m4data_DATA) -@@ -193,7 +193,10 @@ - -rm -f config.h - +@@ -198,7 +198,10 @@ maintainer-clean-hdr: + gtk+.spec: $(top_builddir)/config.status gtk+.spec.in + cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -gtk-config: $(top_builddir)/config.status gtk-config.in -+gtk11d-config.in: gtk-config.in -+ cp gtk-config.in gtk11d-config.in ++gtk12-config.in: gtk-config.in ++ cp gtk-config.in gtk12-config.in + -+gtk11d-config: $(top_builddir)/config.status gtk11d-config.in ++gtk12-config: $(top_builddir)/config.status gtk12-config.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status install-binSCRIPTS: $(bin_SCRIPTS) -@@ -411,15 +414,14 @@ +@@ -407,7 +410,6 @@ + || exit 1; \ + fi; \ + done +- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook + info-am: + info: info-recursive + dvi-am: +@@ -422,13 +424,13 @@ install-exec-am: install-binSCRIPTS install-exec: install-exec-recursive -install-data-am: install-m4dataDATA ++install-data-am: install-data: install-data-recursive install-am: all-am -- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA +uninstall-am: uninstall-binSCRIPTS uninstall: uninstall-recursive --all-am: Makefile $(SCRIPTS) $(DATA) config.h -+all-am: Makefile $(SCRIPTS) config.h + all-am: Makefile $(SCRIPTS) $(DATA) config.h all-redirect: all-recursive-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install --- gdk/Makefile.in.orig Sun Jan 31 23:33:26 1999 +++ gdk/Makefile.in Sun Jan 31 23:35:01 1999 -@@ -123,12 +123,12 @@ +@@ -125,7 +125,7 @@ gdkincludedir = $(includedir)/gdk -lib_LTLIBRARIES = libgdk.la -+lib_LTLIBRARIES = libgdk11d.la ++lib_LTLIBRARIES = libgdk12.la INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ - --libgdk_la_SOURCES = gdk.c gdkcc.c gdkcolor.c gdkcursor.c gdkdnd.c gdkdraw.c gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkim.c gdkimage.c gdkinput.c gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputgxi.h gdkinputxfree.h gdkpixmap.c gdkproperty.c gdkrgb.c gdkrectangle.c gdkregion.c gdkselection.c gdkvisual.c gdkwindow.c gdkxid.c MwmUtil.h gxid_lib.h gxid_proto.h gxid_lib.c -+libgdk11d_la_SOURCES = gdk.c gdkcc.c gdkcolor.c gdkcursor.c gdkdnd.c gdkdraw.c gdkevents.c gdkfont.c gdkgc.c gdkglobals.c gdkim.c gdkimage.c gdkinput.c gdkinput.h gdkinputnone.h gdkinputcommon.h gdkinputgxi.h gdkinputxfree.h gdkpixmap.c gdkproperty.c gdkrgb.c gdkrectangle.c gdkregion.c gdkselection.c gdkvisual.c gdkwindow.c gdkxid.c MwmUtil.h gxid_lib.h gxid_proto.h gxid_lib.c - - - gdkinclude_HEADERS = gdk.h gdkcursors.h gdkrgb.h gdki18n.h gdkkeysyms.h gdkprivate.h gdktypes.h gdkx.h -@@ -137,7 +137,7 @@ +@@ -139,7 +139,7 @@ LDADDS = @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm -libgdk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgdk11d_la_LDFLAGS = -version-info 1:3:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm ++libgdk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm EXTRA_PROGRAMS = gxid -@@ -161,8 +161,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgdk_la_LIBADD = --libgdk_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ -+libgdk11d_la_LIBADD = -+libgdk11d_la_OBJECTS = gdk.lo gdkcc.lo gdkcolor.lo gdkcursor.lo gdkdnd.lo \ - gdkdraw.lo gdkevents.lo gdkfont.lo gdkgc.lo gdkglobals.lo gdkim.lo \ - gdkimage.lo gdkinput.lo gdkpixmap.lo gdkproperty.lo gdkrgb.lo \ - gdkrectangle.lo gdkregion.lo gdkselection.lo gdkvisual.lo gdkwindow.lo \ -@@ -186,8 +186,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgdk_la_SOURCES) $(gxid_SOURCES) --OBJECTS = $(libgdk_la_OBJECTS) $(gxid_OBJECTS) -+SOURCES = $(libgdk11d_la_SOURCES) $(gxid_SOURCES) -+OBJECTS = $(libgdk11d_la_OBJECTS) $(gxid_OBJECTS) - - all: all-redirect - .SUFFIXES: -@@ -263,8 +263,8 @@ +@@ -265,7 +265,7 @@ maintainer-clean-libtool: -libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) -+libgdk11d.la: $(libgdk11d_la_OBJECTS) $(libgdk11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgdk11d_la_LDFLAGS) $(libgdk11d_la_OBJECTS) $(libgdk11d_la_LIBADD) $(LIBS) ++libgdk12.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS) mostlyclean-binPROGRAMS: - --- gtk/Makefile.in.orig Sun Jan 31 23:35:10 1999 +++ gtk/Makefile.in Sun Jan 31 23:37:31 1999 -@@ -125,12 +125,12 @@ +@@ -127,7 +127,7 @@ gtkincludedir = $(includedir)/gtk -lib_LTLIBRARIES = libgtk.la -+lib_LTLIBRARIES = libgtk11d.la ++lib_LTLIBRARIES = libgtk12.la static_SOURCES = gtkaccelgroup.c gtkaccellabel.c gtkadjustment.c gtkalignment.c gtkarg.c gtkarrow.c gtkaspectframe.c gtkbin.c gtkbindings.c gtkbbox.c gtkbox.c gtkbutton.c gtkcalendar.c gtkcheckbutton.c gtkcheckmenuitem.c gtkclist.c gtkcolorsel.c gtkcombo.c gtkcontainer.c gtkctree.c gtkcurve.c gtkdata.c gtkdialog.c gtkdnd.c gtkdrawingarea.c gtkeditable.c gtkentry.c gtkeventbox.c gtkfilesel.c gtkfixed.c gtkfontsel.c gtkframe.c gtkgamma.c gtkgc.c gtkhandlebox.c gtkhbbox.c gtkhbox.c gtkhpaned.c gtkhruler.c gtkhscale.c gtkhscrollbar.c gtkhseparator.c gtkimage.c gtkinputdialog.c gtkintl.h gtkinvisible.c gtkitem.c gtkitemfactory.c gtklabel.c gtklayout.c gtklist.c gtklistitem.c gtkmain.c gtkmenu.c gtkmenubar.c gtkmenufactory.c gtkmenuitem.c gtkmenushell.c gtkmisc.c gtknotebook.c gtkobject.c gtkoptionmenu.c gtkpacker.c gtkpaned.c gtkpixmap.c gtkplug.c gtkpreview.c gtkprogress.c gtkprogressbar.c gtkradiobutton.c gtkradiomenuitem.c gtkrange.c gtkrc.c gtkruler.c gtkscale.c gtkscrollbar.c gtkscrolledwindow.c gtkselection.c gtkseparator.c gtksignal.c gtksocket.c gtkspinbutton.c gtkstyle.c gtkstatusbar.c gtktable.c gtktearoffmenuitem.c gtktext.c gtkthemes.c gtktipsquery.c gtktogglebutton.c gtktoolbar.c gtktooltips.c gtktree.c gtktreeitem.c gtktypeutils.c gtkvbbox.c gtkvbox.c gtkviewport.c gtkvpaned.c gtkvruler.c gtkvscale.c gtkvscrollbar.c gtkvseparator.c gtkwidget.c gtkwindow.c fnmatch.c fnmatch.h +@@ -152,26 +152,26 @@ + gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h --libgtk_la_SOURCES = $(static_SOURCES) gtkmarshal.c -+libgtk11d_la_SOURCES = $(static_SOURCES) gtkmarshal.c +-libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm ++libgtk_la_LDFLAGS = -version-info 1:0:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm - # Source headers which are non-autogenerated headers -@@ -150,7 +150,7 @@ - gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h + # $(top_builddir)/gdk/libgdk.la +-gtkconfdir = $(sysconfdir)/gtk ++gtkconfdir = $(datadir)/themes/Default/gtk + gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru --libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm -+libgtk11d_la_LDFLAGS = -version-info 1:3:0 @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm + EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm gtkrc.ja gtkrc.ko gtkrc.ru + + +-INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(sysconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ ++INCLUDES = -DGTK_DISABLE_COMPAT_H -DG_LOG_DOMAIN=\"Gtk\" -DGTK_EXE_PREFIX=\"$(exec_prefix)\" -DGTK_DATA_PREFIX=\"$(prefix)\" -DGTK_SYSCONFDIR=\"$(gtkconfdir)\" -DGTK_LOCALEDIR=\"$(gtklocaledir)\" -I$(top_srcdir) @GTK_DEBUG_FLAGS@ @GTK_XIM_FLAGS@ @GTK_LOCALE_FLAGS@ @GLIB_CFLAGS@ @x_cflags@ - EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtk.1 testgtkrc testgtkrc2 gtkfeatures.h.in makeenums.pl makeenums.awk maketypes.awk makeenums.h gtkargcollector.c gtktypebuiltins_vars.c gtktypebuiltins_ids.c gtktypebuiltins_evals.c gtk-boxed.defs gtk.defs genmarshal.pl gtkmarshal.list check-y.xpm check-n.xpm test.xpm marble.xpm 3DRings.xpm FilesQueue.xpm Modeller.xpm tree_plus.xpm tree_minus.xpm tree_plus.xbm tree_minus.xbm circles.xbm -@@ -162,10 +162,10 @@ noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple # testthreads -DEPS = libgtk.la $(top_builddir)/gdk/libgdk.la -+DEPS = libgtk11d.la $(top_builddir)/gdk/libgdk11d.la ++DEPS = libgtk12.la $(top_builddir)/gdk/libgdk12.la -LDADDS = libgtk.la $(top_builddir)/gdk/libgdk.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm -+LDADDS = libgtk11d.la $(top_builddir)/gdk/libgdk11d.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm ++LDADDS = libgtk12.la $(top_builddir)/gdk/libgdk12.la @x_ldflags@ @x_libs@ @GLIB_LIBS@ -lm testgtk_DEPENDENCIES = $(DEPS) -@@ -197,8 +197,8 @@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ - X_PRE_LIBS = @X_PRE_LIBS@ --libgtk_la_LIBADD = --libgtk_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \ -+libgtk11d_la_LIBADD = -+libgtk11d_la_OBJECTS = gtkaccelgroup.lo gtkaccellabel.lo gtkadjustment.lo \ - gtkalignment.lo gtkarg.lo gtkarrow.lo gtkaspectframe.lo gtkbin.lo \ - gtkbindings.lo gtkbbox.lo gtkbox.lo gtkbutton.lo gtkcalendar.lo \ - gtkcheckbutton.lo gtkcheckmenuitem.lo gtkclist.lo gtkcolorsel.lo \ -@@ -255,8 +255,8 @@ - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c --OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o -+SOURCES = $(libgtk11d_la_SOURCES) testgtk.c testinput.c testselection.c testrgb.c testdnd.c simple.c -+OBJECTS = $(libgtk11d_la_OBJECTS) testgtk.o testinput.o testselection.o testrgb.o testdnd.o simple.o - - all: all-redirect - .SUFFIXES: -@@ -334,8 +334,8 @@ +@@ -342,7 +342,7 @@ maintainer-clean-libtool: -libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) -- $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) -+libgtk11d.la: $(libgtk11d_la_OBJECTS) $(libgtk11d_la_DEPENDENCIES) -+ $(LINK) -rpath $(libdir) $(libgtk11d_la_LDFLAGS) $(libgtk11d_la_OBJECTS) $(libgtk11d_la_LIBADD) $(LIBS) ++libgtk12.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS) mostlyclean-noinstPROGRAMS: - -@@ -450,7 +450,7 @@ - uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkincludeHEADERS \ - uninstall-local +@@ -478,7 +478,7 @@ + uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \ + uninstall-gtkincludeHEADERS uninstall-local uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) -+all-am: Makefile $(LTLIBRARIES) $(HEADERS) +-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) ++all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- po/Makefile.in.in.orig Sun Jan 31 23:37:42 1999 -+++ po/Makefile.in.in Sun Jan 31 23:37:51 1999 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po ---- docs/Makefile.in.orig Tue Feb 2 03:29:59 1999 -+++ docs/Makefile.in Tue Feb 2 03:30:15 1999 +@@ -599,17 +599,11 @@ + && echo timestamp > stamp-m + + gtkrc: +- : +- +-# We create a dummy theme for the default GTK+ theme ++ echo "# Empty gtkrc for default theme" > gtkrc + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk +- echo "# Empty gtkrc for default theme" > \ +- $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc + + uninstall-local: +- rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc + + .PHONY: files test test-debug + +--- docs/Makefile.in.orig Thu Feb 25 22:17:02 1999 ++++ docs/Makefile.in Tue Mar 2 11:39:50 1999 @@ -99,7 +99,7 @@ LT_RELEASE = @LT_RELEASE@ LT_REVISION = @LT_REVISION@ @@ -211,3 +174,30 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ NM = @NM@ PACKAGE = @PACKAGE@ +@@ -125,7 +125,7 @@ + + info_TEXINFOS = gdk.texi gtk.texi + +-man_MANS = gtk-config.1 ++man_MANS = gtk12-config.1 + + TUTORIAL_FR_FILES = html/gtk_tut_fr-1.html html/gtk_tut_fr-2.html html/gtk_tut_fr-3.html html/gtk_tut_fr-4.html html/gtk_tut_fr-5.html html/gtk_tut_fr-6.html html/gtk_tut_fr-7.html html/gtk_tut_fr-8.html html/gtk_tut_fr-9.html html/gtk_tut_fr-10.html html/gtk_tut_fr-11.html html/gtk_tut_fr-12.html html/gtk_tut_fr-13.html html/gtk_tut_fr-14.html html/gtk_tut_fr-15.html html/gtk_tut_fr-16.html html/gtk_tut_fr-17.html html/gtk_tut_fr-18.html html/gtk_tut_fr-19.html html/gtk_tut_fr-20.html html/gtk_tut_fr-21.html html/gtk_tut_fr-22.html html/gtk_tut_fr-23.html html/gtk_tut_fr-24.html html/gtk_tut_fr.html text/gtk_tut_fr.txt + +@@ -139,7 +139,7 @@ + FAQ_FILES = html/gtkfaq.html html/gtkfaq-1.html html/gtkfaq-2.html html/gtkfaq-3.html html/gtkfaq-4.html html/gtkfaq-5.html html/gtkfaq-6.html html/gtkfaq-7.html text/gtkfaq.txt + + +-EXTRA_DIST = gtk-config.1 texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) ++EXTRA_DIST = gtk12-config.1 texinfo.tex macros.texi gtkdocs_fix gtkfaq.sgml gtk-config.txt gtk_tut.sgml gtk_tut_it.sgml gtk_tut_fr.sgml debugging.txt developers.txt refcounting.txt styles.txt text_widget.txt widget_system.txt gtk_tut_packbox1.gif gtk_tut_packbox2.gif html/gtk_tut_table.gif html/gtk_tut_packbox1.gif html/gtk_tut_packbox2.gif gtk_tut_table.gif html/gdk.html html/gdk_toc.html html/gtk.html html/gtk_toc.html $(TUTORIAL_FILES) $(TUTORIAL_FR_FILES) $(TUTORIAL_IT_FILES) $(FAQ_FILES) + + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -177,6 +177,8 @@ + gtk.info: gtk.texi + gtk.dvi: gtk.texi + ++gtk12-config.1: gtk-config.1 ++ cp gtk-config.1 gtk12-config.1 + + DVIPS = dvips + diff --git a/x11-toolkits/gtk12/files/patch-ab b/x11-toolkits/gtk12/files/patch-ab index 8bcd09e856f3..5daa432dc5b9 100644 --- a/x11-toolkits/gtk12/files/patch-ab +++ b/x11-toolkits/gtk12/files/patch-ab @@ -1,10 +1,19 @@ --- gtk-config.in.orig Thu Feb 4 17:06:44 1999 +++ gtk-config.in Wed Feb 17 21:22:48 1999 +@@ -12,7 +12,7 @@ + usage() + { + cat <<EOF +-Usage: gtk-config [OPTIONS] [LIBRARIES] ++Usage: gtk12-config [OPTIONS] [LIBRARIES] + Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] @@ -115,6 +115,6 @@ fi done - echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm -+ echo $libdirs @x_ldflags@ -lgtk11d -lgdk11d $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm ++ echo $libdirs @x_ldflags@ -lgtk12 -lgdk12 $my_glib_libs @INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm fi diff --git a/x11-toolkits/gtk12/files/patch-ad b/x11-toolkits/gtk12/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk12/files/patch-ad +++ b/x11-toolkits/gtk12/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk12/files/patch-ae b/x11-toolkits/gtk12/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk12/files/patch-ae +++ b/x11-toolkits/gtk12/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk12/pkg-descr b/x11-toolkits/gtk12/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk12/pkg-descr +++ b/x11-toolkits/gtk12/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk12/pkg-plist +++ b/x11-toolkits/gtk12/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk13/Makefile +++ b/x11-toolkits/gtk13/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk13/distinfo b/x11-toolkits/gtk13/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk13/distinfo +++ b/x11-toolkits/gtk13/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk13/files/patch-ad b/x11-toolkits/gtk13/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk13/files/patch-ad +++ b/x11-toolkits/gtk13/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk13/files/patch-ae b/x11-toolkits/gtk13/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk13/files/patch-ae +++ b/x11-toolkits/gtk13/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk13/pkg-descr b/x11-toolkits/gtk13/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk13/pkg-descr +++ b/x11-toolkits/gtk13/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk13/pkg-plist b/x11-toolkits/gtk13/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk13/pkg-plist +++ b/x11-toolkits/gtk13/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk20/distinfo +++ b/x11-toolkits/gtk20/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk20/files/patch-ad b/x11-toolkits/gtk20/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk20/files/patch-ad +++ b/x11-toolkits/gtk20/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk20/files/patch-ae b/x11-toolkits/gtk20/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk20/files/patch-ae +++ b/x11-toolkits/gtk20/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk20/pkg-descr b/x11-toolkits/gtk20/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk20/pkg-descr +++ b/x11-toolkits/gtk20/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk20/pkg-plist b/x11-toolkits/gtk20/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk20/pkg-plist +++ b/x11-toolkits/gtk20/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 47d3fc8e8399..0136c7202403 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -1,43 +1,49 @@ -# New ports collection makefile for: gtk11-devel -# Version required: 1.1.16 +# New ports collection makefile for: gtk12 +# Version required: 1.2.0 # Date Created: 28 Sep 1997 # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $ # -DISTNAME= gtk+-1.1.16 -PKGNAME= gtk-1.1.16 +DISTNAME= gtk+-1.2.0 +PKGNAME= gtk-1.2.0 CATEGORIES= x11-toolkits -MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/gtk/v1.2/ MAINTAINER= vanilla@FreeBSD.ORG BUILD_DEPENDS= gettext:${PORTSDIR}/devel/gettext RUN_DEPENDS= gettext:${PORTSDIR}/devel/gettext -LIB_DEPENDS= glib11d.2:${PORTSDIR}/devel/glib11-devel +LIB_DEPENDS= glib12.1:${PORTSDIR}/devel/glib12 USE_X_PREFIX= yes USE_PERL5= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk11d +CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \ + GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtk-config.1 +MAN1= gtk12-config.1 pre-build: ${RM} -rf ${WRKSRC}/docs/gtk.info* post-install: - @${MKDIR} ${LOCALBASE}/share/aclocal - @${INSTALL_DATA} ${WRKSRC}/gtk.m4 ${LOCALBASE}/share/aclocal/gtk11d.m4 + @${MKDIR} ${PREFIX}/share/themes/engines @if [ ! -f ${PREFIX}/share/info ]; then \ ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ fi @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${ECHO} '*********************************************************' + @${ECHO} '* *' + @${ECHO} '* If you want to use autoconf with gtk, *' + @${ECHO} '* Please copy gtk.m4 to /usr/local/share/aclocal *' + @${ECHO} '* by yourself, thanks. *' + @${ECHO} '* *' + @${ECHO} '*********************************************************' .include <bsd.port.mk> diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo index 992dadfae7e1..b648580fc3d6 100644 --- a/x11-toolkits/gtk30/distinfo +++ b/x11-toolkits/gtk30/distinfo @@ -1 +1 @@ -MD5 (gtk+-1.1.16.tar.gz) = 6de7a1a397eac37d7fc1f8ef008a9f02 +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11-toolkits/gtk30/files/patch-ad b/x11-toolkits/gtk30/files/patch-ad index e0851a1a730f..43832268e1e3 100644 --- a/x11-toolkits/gtk30/files/patch-ad +++ b/x11-toolkits/gtk30/files/patch-ad @@ -1,6 +1,6 @@ --- gtk/gtkrc.c.orig Mon Jan 4 17:33:28 1999 +++ gtk/gtkrc.c Tue Jan 5 07:41:04 1999 -@@ -223,9 +223,9 @@ +@@ -231,9 +231,9 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -12,7 +12,7 @@ return path; } -@@ -238,9 +238,9 @@ +@@ -246,9 +246,9 @@ var = getenv("GTK_DATA_PREFIX"); if (var) @@ -24,7 +24,7 @@ for (n = 0; pixmap_path[n]; n++) ; if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1) -@@ -274,15 +274,15 @@ +@@ -282,15 +282,15 @@ var = getenv("GTK_EXE_PREFIX"); if (var) @@ -43,3 +43,12 @@ module_path[n++] = g_strdup(path); module_path[n] = NULL; g_free(path); +@@ -324,7 +324,7 @@ + } + else + { +- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc"); ++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc"); + gtk_rc_add_default_file (str); + g_free (str); + diff --git a/x11-toolkits/gtk30/files/patch-ae b/x11-toolkits/gtk30/files/patch-ae index 20f506155853..854b0d4e5cc3 100644 --- a/x11-toolkits/gtk30/files/patch-ae +++ b/x11-toolkits/gtk30/files/patch-ae @@ -1,11 +1,11 @@ ---- configure.orig Thu Feb 18 01:35:07 1999 -+++ configure Thu Feb 18 01:35:27 1999 -@@ -4444,7 +4444,7 @@ - - # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME - # this is the directory where the *.{mo,gmo} files are installed --gtklocaledir='${prefix}/${DATADIRNAME}/locale' -+gtklocaledir='${prefix}/share/locale' - - - echo $ac_n "checking for extra flags to get ANSI library prototypes""... $ac_c" 1>&6 +--- configure.orig Thu Feb 25 13:02:28 1999 ++++ configure Tue Mar 2 11:11:14 1999 +@@ -3977,7 +3977,7 @@ + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=share + fi + rm -f conftest* + INSTOBJEXT=.mo diff --git a/x11-toolkits/gtk30/pkg-descr b/x11-toolkits/gtk30/pkg-descr index 15cddd29f66d..75f50206dbe7 100644 --- a/x11-toolkits/gtk30/pkg-descr +++ b/x11-toolkits/gtk30/pkg-descr @@ -2,10 +2,9 @@ the Motif "look and feel". It is designed to be small and efficient, but still flexible enough to allow the programmer freedom in the interfaces created. GTK allows the programmer to use a variety of standard user -interface widgets (*note Widgets::.) such as push, radio and check -buttons, menus, lists and frames. It also provides several "container" -widgets which can be used to control the layout of the user interface -elements. +interface widgets such as push, radio and check buttons, menus, lists +and frames. It also provides several "container" widgets which can be +used to control the layout of the user interface elements. GTK provides some unique features. (At least, I know of no other widget library which provides them). For example, a button does not diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist index 33398999e7a4..eaa533417e51 100644 --- a/x11-toolkits/gtk30/pkg-plist +++ b/x11-toolkits/gtk30/pkg-plist @@ -1,124 +1,124 @@ -bin/gtk11d-config -include/gtk11d/gdk/gdk.h -include/gtk11d/gdk/gdkcursors.h -include/gtk11d/gdk/gdki18n.h -include/gtk11d/gdk/gdkkeysyms.h -include/gtk11d/gdk/gdkprivate.h -include/gtk11d/gdk/gdkrgb.h -include/gtk11d/gdk/gdktypes.h -include/gtk11d/gdk/gdkx.h -include/gtk11d/gtk/gtk.h -include/gtk11d/gtk/gtkaccelgroup.h -include/gtk11d/gtk/gtkaccellabel.h -include/gtk11d/gtk/gtkadjustment.h -include/gtk11d/gtk/gtkalignment.h -include/gtk11d/gtk/gtkarg.h -include/gtk11d/gtk/gtkarrow.h -include/gtk11d/gtk/gtkaspectframe.h -include/gtk11d/gtk/gtkbbox.h -include/gtk11d/gtk/gtkbin.h -include/gtk11d/gtk/gtkbindings.h -include/gtk11d/gtk/gtkbox.h -include/gtk11d/gtk/gtkbutton.h -include/gtk11d/gtk/gtkcalendar.h -include/gtk11d/gtk/gtkcheckbutton.h -include/gtk11d/gtk/gtkcheckmenuitem.h -include/gtk11d/gtk/gtkclist.h -include/gtk11d/gtk/gtkcolorsel.h -include/gtk11d/gtk/gtkcombo.h -include/gtk11d/gtk/gtkcompat.h -include/gtk11d/gtk/gtkcontainer.h -include/gtk11d/gtk/gtkctree.h -include/gtk11d/gtk/gtkcurve.h -include/gtk11d/gtk/gtkdata.h -include/gtk11d/gtk/gtkdebug.h -include/gtk11d/gtk/gtkdialog.h -include/gtk11d/gtk/gtkdnd.h -include/gtk11d/gtk/gtkdrawingarea.h -include/gtk11d/gtk/gtkeditable.h -include/gtk11d/gtk/gtkentry.h -include/gtk11d/gtk/gtkenums.h -include/gtk11d/gtk/gtkeventbox.h -include/gtk11d/gtk/gtkfeatures.h -include/gtk11d/gtk/gtkfilesel.h -include/gtk11d/gtk/gtkfixed.h -include/gtk11d/gtk/gtkfontsel.h -include/gtk11d/gtk/gtkframe.h -include/gtk11d/gtk/gtkgamma.h -include/gtk11d/gtk/gtkgc.h -include/gtk11d/gtk/gtkhandlebox.h -include/gtk11d/gtk/gtkhbbox.h -include/gtk11d/gtk/gtkhbox.h -include/gtk11d/gtk/gtkhpaned.h -include/gtk11d/gtk/gtkhruler.h -include/gtk11d/gtk/gtkhscale.h -include/gtk11d/gtk/gtkhscrollbar.h -include/gtk11d/gtk/gtkhseparator.h -include/gtk11d/gtk/gtkimage.h -include/gtk11d/gtk/gtkinputdialog.h -include/gtk11d/gtk/gtkinvisible.h -include/gtk11d/gtk/gtkitem.h -include/gtk11d/gtk/gtkitemfactory.h -include/gtk11d/gtk/gtklabel.h -include/gtk11d/gtk/gtklayout.h -include/gtk11d/gtk/gtklist.h -include/gtk11d/gtk/gtklistitem.h -include/gtk11d/gtk/gtkmain.h -include/gtk11d/gtk/gtkmarshal.h -include/gtk11d/gtk/gtkmenu.h -include/gtk11d/gtk/gtkmenubar.h -include/gtk11d/gtk/gtkmenufactory.h -include/gtk11d/gtk/gtkmenuitem.h -include/gtk11d/gtk/gtkmenushell.h -include/gtk11d/gtk/gtkmisc.h -include/gtk11d/gtk/gtknotebook.h -include/gtk11d/gtk/gtkobject.h -include/gtk11d/gtk/gtkoptionmenu.h -include/gtk11d/gtk/gtkpacker.h -include/gtk11d/gtk/gtkpaned.h -include/gtk11d/gtk/gtkpixmap.h -include/gtk11d/gtk/gtkplug.h -include/gtk11d/gtk/gtkpreview.h -include/gtk11d/gtk/gtkprivate.h -include/gtk11d/gtk/gtkprogress.h -include/gtk11d/gtk/gtkprogressbar.h -include/gtk11d/gtk/gtkradiobutton.h -include/gtk11d/gtk/gtkradiomenuitem.h -include/gtk11d/gtk/gtkrange.h -include/gtk11d/gtk/gtkrc.h -include/gtk11d/gtk/gtkruler.h -include/gtk11d/gtk/gtkscale.h -include/gtk11d/gtk/gtkscrollbar.h -include/gtk11d/gtk/gtkscrolledwindow.h -include/gtk11d/gtk/gtkselection.h -include/gtk11d/gtk/gtkseparator.h -include/gtk11d/gtk/gtksignal.h -include/gtk11d/gtk/gtksocket.h -include/gtk11d/gtk/gtkspinbutton.h -include/gtk11d/gtk/gtkstatusbar.h -include/gtk11d/gtk/gtkstyle.h -include/gtk11d/gtk/gtktable.h -include/gtk11d/gtk/gtktearoffmenuitem.h -include/gtk11d/gtk/gtktext.h -include/gtk11d/gtk/gtkthemes.h -include/gtk11d/gtk/gtktipsquery.h -include/gtk11d/gtk/gtktogglebutton.h -include/gtk11d/gtk/gtktoolbar.h -include/gtk11d/gtk/gtktooltips.h -include/gtk11d/gtk/gtktree.h -include/gtk11d/gtk/gtktreeitem.h -include/gtk11d/gtk/gtktypebuiltins.h -include/gtk11d/gtk/gtktypeutils.h -include/gtk11d/gtk/gtkvbbox.h -include/gtk11d/gtk/gtkvbox.h -include/gtk11d/gtk/gtkviewport.h -include/gtk11d/gtk/gtkvpaned.h -include/gtk11d/gtk/gtkvruler.h -include/gtk11d/gtk/gtkvscale.h -include/gtk11d/gtk/gtkvscrollbar.h -include/gtk11d/gtk/gtkvseparator.h -include/gtk11d/gtk/gtkwidget.h -include/gtk11d/gtk/gtkwindow.h +bin/gtk12-config +include/gtk12/gdk/gdk.h +include/gtk12/gdk/gdkcursors.h +include/gtk12/gdk/gdki18n.h +include/gtk12/gdk/gdkkeysyms.h +include/gtk12/gdk/gdkprivate.h +include/gtk12/gdk/gdkrgb.h +include/gtk12/gdk/gdktypes.h +include/gtk12/gdk/gdkx.h +include/gtk12/gtk/gtk.h +include/gtk12/gtk/gtkaccelgroup.h +include/gtk12/gtk/gtkaccellabel.h +include/gtk12/gtk/gtkadjustment.h +include/gtk12/gtk/gtkalignment.h +include/gtk12/gtk/gtkarg.h +include/gtk12/gtk/gtkarrow.h +include/gtk12/gtk/gtkaspectframe.h +include/gtk12/gtk/gtkbbox.h +include/gtk12/gtk/gtkbin.h +include/gtk12/gtk/gtkbindings.h +include/gtk12/gtk/gtkbox.h +include/gtk12/gtk/gtkbutton.h +include/gtk12/gtk/gtkcalendar.h +include/gtk12/gtk/gtkcheckbutton.h +include/gtk12/gtk/gtkcheckmenuitem.h +include/gtk12/gtk/gtkclist.h +include/gtk12/gtk/gtkcolorsel.h +include/gtk12/gtk/gtkcombo.h +include/gtk12/gtk/gtkcompat.h +include/gtk12/gtk/gtkcontainer.h +include/gtk12/gtk/gtkctree.h +include/gtk12/gtk/gtkcurve.h +include/gtk12/gtk/gtkdata.h +include/gtk12/gtk/gtkdebug.h +include/gtk12/gtk/gtkdialog.h +include/gtk12/gtk/gtkdnd.h +include/gtk12/gtk/gtkdrawingarea.h +include/gtk12/gtk/gtkeditable.h +include/gtk12/gtk/gtkentry.h +include/gtk12/gtk/gtkenums.h +include/gtk12/gtk/gtkeventbox.h +include/gtk12/gtk/gtkfeatures.h +include/gtk12/gtk/gtkfilesel.h +include/gtk12/gtk/gtkfixed.h +include/gtk12/gtk/gtkfontsel.h +include/gtk12/gtk/gtkframe.h +include/gtk12/gtk/gtkgamma.h +include/gtk12/gtk/gtkgc.h +include/gtk12/gtk/gtkhandlebox.h +include/gtk12/gtk/gtkhbbox.h +include/gtk12/gtk/gtkhbox.h +include/gtk12/gtk/gtkhpaned.h +include/gtk12/gtk/gtkhruler.h +include/gtk12/gtk/gtkhscale.h +include/gtk12/gtk/gtkhscrollbar.h +include/gtk12/gtk/gtkhseparator.h +include/gtk12/gtk/gtkimage.h +include/gtk12/gtk/gtkinputdialog.h +include/gtk12/gtk/gtkinvisible.h +include/gtk12/gtk/gtkitem.h +include/gtk12/gtk/gtkitemfactory.h +include/gtk12/gtk/gtklabel.h +include/gtk12/gtk/gtklayout.h +include/gtk12/gtk/gtklist.h +include/gtk12/gtk/gtklistitem.h +include/gtk12/gtk/gtkmain.h +include/gtk12/gtk/gtkmarshal.h +include/gtk12/gtk/gtkmenu.h +include/gtk12/gtk/gtkmenubar.h +include/gtk12/gtk/gtkmenufactory.h +include/gtk12/gtk/gtkmenuitem.h +include/gtk12/gtk/gtkmenushell.h +include/gtk12/gtk/gtkmisc.h +include/gtk12/gtk/gtknotebook.h +include/gtk12/gtk/gtkobject.h +include/gtk12/gtk/gtkoptionmenu.h +include/gtk12/gtk/gtkpacker.h +include/gtk12/gtk/gtkpaned.h +include/gtk12/gtk/gtkpixmap.h +include/gtk12/gtk/gtkplug.h +include/gtk12/gtk/gtkpreview.h +include/gtk12/gtk/gtkprivate.h +include/gtk12/gtk/gtkprogress.h +include/gtk12/gtk/gtkprogressbar.h +include/gtk12/gtk/gtkradiobutton.h +include/gtk12/gtk/gtkradiomenuitem.h +include/gtk12/gtk/gtkrange.h +include/gtk12/gtk/gtkrc.h +include/gtk12/gtk/gtkruler.h +include/gtk12/gtk/gtkscale.h +include/gtk12/gtk/gtkscrollbar.h +include/gtk12/gtk/gtkscrolledwindow.h +include/gtk12/gtk/gtkselection.h +include/gtk12/gtk/gtkseparator.h +include/gtk12/gtk/gtksignal.h +include/gtk12/gtk/gtksocket.h +include/gtk12/gtk/gtkspinbutton.h +include/gtk12/gtk/gtkstatusbar.h +include/gtk12/gtk/gtkstyle.h +include/gtk12/gtk/gtktable.h +include/gtk12/gtk/gtktearoffmenuitem.h +include/gtk12/gtk/gtktext.h +include/gtk12/gtk/gtkthemes.h +include/gtk12/gtk/gtktipsquery.h +include/gtk12/gtk/gtktogglebutton.h +include/gtk12/gtk/gtktoolbar.h +include/gtk12/gtk/gtktooltips.h +include/gtk12/gtk/gtktree.h +include/gtk12/gtk/gtktreeitem.h +include/gtk12/gtk/gtktypebuiltins.h +include/gtk12/gtk/gtktypeutils.h +include/gtk12/gtk/gtkvbbox.h +include/gtk12/gtk/gtkvbox.h +include/gtk12/gtk/gtkviewport.h +include/gtk12/gtk/gtkvpaned.h +include/gtk12/gtk/gtkvruler.h +include/gtk12/gtk/gtkvscale.h +include/gtk12/gtk/gtkvscrollbar.h +include/gtk12/gtk/gtkvseparator.h +include/gtk12/gtk/gtkwidget.h +include/gtk12/gtk/gtkwindow.h @unexec install-info --delete %D/info/gdk.info %D/info/dir @unexec install-info --delete %D/info/gtk.info %D/info/dir info/gdk.info @@ -126,20 +126,21 @@ info/gtk.info @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/gdk.info %D/info/dir @exec install-info %D/info/gtk.info %D/info/dir -lib/libgdk11d.a -lib/libgdk11d.la -lib/libgdk11d.so -lib/libgdk11d.so.1.3 -lib/libgtk11d.a -lib/libgtk11d.la -lib/libgtk11d.so -lib/libgtk11d.so.1.3 +lib/libgdk12.a +lib/libgdk12.la +lib/libgdk12.so +lib/libgdk12.so.1 +lib/libgtk12.a +lib/libgtk12.la +lib/libgtk12.so +lib/libgtk12.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/locale/cs/LC_MESSAGES/gtk+.mo share/locale/de/LC_MESSAGES/gtk+.mo share/locale/es/LC_MESSAGES/gtk+.mo share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo share/locale/it/LC_MESSAGES/gtk+.mo share/locale/ja/LC_MESSAGES/gtk+.mo share/locale/ko/LC_MESSAGES/gtk+.mo @@ -150,10 +151,14 @@ share/locale/pt/LC_MESSAGES/gtk+.mo share/locale/ru/LC_MESSAGES/gtk+.mo share/locale/sv/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc +share/themes/Default/gtk/gtkrc.ja +share/themes/Default/gtk/gtkrc.ko +share/themes/Default/gtk/gtkrc.ru +@exec mkdir -p %D/share/themes/engines @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes/engines @dirrm share/themes -@dirrm include/gtk11d/gdk -@dirrm include/gtk11d/gtk -@dirrm include/gtk11d +@dirrm include/gtk12/gdk +@dirrm include/gtk12/gtk +@dirrm include/gtk12 diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/gnome-libs/files/patch-ac +++ b/x11/gnome-libs/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ 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 -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ 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 -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@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 diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index dd818ad0312a..a7a5eacf7bc4 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -1,29 +1,29 @@ # New ports collection makefile for: gnome -# Version required: 0.99.3 +# Version required: 1.0.0 # Date created: 17 Aug 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $ # -DISTNAME= gnome-0.99.3 -CATEGORIES= x11 +DISTNAME= gnome-1.0.0 +CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ - panel_applet.1:${PORTSDIR}/x11/gnomecore \ - gdkcardimage.1:${PORTSDIR}/games/gnomegames \ - gnomeprint.0:${PORTSDIR}/print/gnomeprint -# gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin -RUN_DEPENDS= gcalc:${PORTSDIR}/misc/gnomeutils \ +RUN_DEPENDS= gtcd:${PORTSDIR}/audio/gnomemedia \ + gnomecard:${PORTSDIR}/deskutils/gnomepim \ + gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gtop:${PORTSDIR}/sysutils/gtop \ + gnumeric:${PORTSDIR}/math/gnumeric \ + gcalc:${PORTSDIR}/misc/gnomeutils \ + gtalk:${PORTSDIR}/net/gnomenetwork \ + gulp:${PORTSDIR}/sysutils/gnomeadmin \ gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - gnomecard:${PORTSDIR}/deskutils/gnomepim \ - gnumeric:${PORTSDIR}/math/gnumeric + gtop:${PORTSDIR}/sysutils/gtop \ + gmc:${PORTSDIR}/x11-fm/gnomemc EXTRACT_ONLY= # empty NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index dd818ad0312a..a7a5eacf7bc4 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -1,29 +1,29 @@ # New ports collection makefile for: gnome -# Version required: 0.99.3 +# Version required: 1.0.0 # Date created: 17 Aug 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.3 1999/01/20 22:11:43 vanilla Exp $ +# $Id: Makefile,v 1.4 1999/01/21 06:10:09 jkh Exp $ # -DISTNAME= gnome-0.99.3 -CATEGORIES= x11 +DISTNAME= gnome-1.0.0 +CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= nacai@iname.com -LIB_DEPENDS= gnome.1:${PORTSDIR}/x11/gnomelibs \ - panel_applet.1:${PORTSDIR}/x11/gnomecore \ - gdkcardimage.1:${PORTSDIR}/games/gnomegames \ - gnomeprint.0:${PORTSDIR}/print/gnomeprint -# gxsnmp.1:${PORTSDIR}/sysutils/gnomeadmin -RUN_DEPENDS= gcalc:${PORTSDIR}/misc/gnomeutils \ +RUN_DEPENDS= gtcd:${PORTSDIR}/audio/gnomemedia \ + gnomecard:${PORTSDIR}/deskutils/gnomepim \ + gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gtop:${PORTSDIR}/sysutils/gtop \ + gnumeric:${PORTSDIR}/math/gnumeric \ + gcalc:${PORTSDIR}/misc/gnomeutils \ + gtalk:${PORTSDIR}/net/gnomenetwork \ + gulp:${PORTSDIR}/sysutils/gnomeadmin \ gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ - gnomecard:${PORTSDIR}/deskutils/gnomepim \ - gnumeric:${PORTSDIR}/math/gnumeric + gtop:${PORTSDIR}/sysutils/gtop \ + gmc:${PORTSDIR}/x11-fm/gnomemc EXTRACT_ONLY= # empty NO_BUILD= yes diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index 8012cd447da5..074755689656 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -1,20 +1,20 @@ # New ports collection makefile for: gnomecore -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 March 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.17 1999/02/02 08:30:21 vanilla Exp $ +# $Id: Makefile,v 1.18 1999/02/19 04:26:33 vanilla Exp $ # -DISTNAME= gnome-core-0.99.8.1 -PKGNAME= gnomecore-0.99.8.1 +DISTNAME= gnome-core-1.0.1 +PKGNAME= gnomecore-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-core +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/duck.wav:${PORTSDIR}/audio/gnomeaudio +RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ ghttp.0:${PORTSDIR}/www/libghttp @@ -28,16 +28,10 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --with-gnome=${X11BASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib - chown root.kmem ${PREFIX}/bin/cpumemusage_applet - chown root.kmem ${PREFIX}/bin/diskusage_applet - chown root.kmem ${PREFIX}/bin/multiload_applet - chmod 2555 ${PREFIX}/bin/cpumemusage_applet - chmod 2555 ${PREFIX}/bin/diskusage_applet - chmod 2555 ${PREFIX}/bin/multiload_applet .include <bsd.port.mk> diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo index 4dbf7775d069..01226fad42fa 100644 --- a/x11/gnomecore/distinfo +++ b/x11/gnomecore/distinfo @@ -1 +1 @@ -MD5 (gnome-core-0.99.8.1.tar.gz) = 927e5ffaaba7a8fd5cd1b55be993d5b0 +MD5 (gnome-core-1.0.1.tar.gz) = 9ce27fa72576f0dc3291ec8d5c71b96f diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa index 32da72ad6ce5..b46bf15f1c0b 100644 --- a/x11/gnomecore/files/patch-aa +++ b/x11/gnomecore/files/patch-aa @@ -1,25 +1,6 @@ ---- configure.orig Tue Feb 16 01:45:51 1999 -+++ configure Fri Feb 19 03:41:47 1999 -@@ -1133,13 +1133,13 @@ - fi - - if test "$no_gnome_config" = "yes"; then -- echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 --echo "configure:1138: checking for gnomeConf.sh file in $gnome_prefix" >&5 -- if test -f $gnome_prefix/gnomeConf.sh; then -+ echo $ac_n "checking for gnomeConf.sh file in $prefix/share/gnome""... $ac_c" 1>&6 -+echo "configure:1138: checking for gnomeConf.sh file in $prefix/share/gnome" >&5 -+ if test -f $prefix/share/gnome/gnomeConf.sh; then - echo "$ac_t""found" 1>&6 - echo "loading gnome configuration from" \ -- "$gnome_prefix/gnomeConf.sh" -- . $gnome_prefix/gnomeConf.sh -+ "$prefix/share/gnome/gnomeConf.sh" -+ . $prefix/share/gnome/gnomeConf.sh - - else - echo "$ac_t""not found" 1>&6 -@@ -5071,7 +5071,7 @@ +--- configure.orig Sun Feb 28 23:24:44 1999 ++++ configure Tue Mar 2 19:12:49 1999 +@@ -5076,7 +5076,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -28,7 +9,7 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -5333,7 +5333,7 @@ +@@ -5338,7 +5338,7 @@ USE_INCLUDED_LIBINTL=yes CATOBJEXT=.cat INSTOBJEXT=.cat @@ -37,3 +18,11 @@ INTLDEPS='$(top_builddir)/intl/libintl.a' INTLLIBS=$INTLDEPS LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -6247,6 +6247,7 @@ + case "$host" in + *linux*) CDROM_HOST=linux;; + *solaris*) CDROM_HOST=solaris;; ++*freebsd*) CDROM_HOST=freebsd;; + esac + + diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 320b3643a70b..464ef2979f01 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,7 +1,18 @@ ---- applets/asclock/Makefile.in.orig Mon Feb 1 07:46:49 1999 -+++ applets/asclock/Makefile.in Tue Feb 2 05:58:39 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/Makefile.in.orig Tue Mar 2 01:53:28 1999 ++++ applets/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc ++always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc + + @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager + @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = +--- applets/asclock/Makefile.in.orig Tue Mar 2 01:53:34 1999 ++++ applets/asclock/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -9,10 +20,10 @@ bin_PROGRAMS = asclock_applet ---- applets/battery/Makefile.in.orig Mon Feb 1 07:47:01 1999 -+++ applets/battery/Makefile.in Tue Feb 2 05:58:56 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999 ++++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -20,10 +31,10 @@ bin_PROGRAMS = battery_applet ---- applets/cdplayer/Makefile.in.orig Mon Feb 1 07:47:23 1999 -+++ applets/cdplayer/Makefile.in Tue Feb 2 05:59:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999 ++++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -31,10 +42,10 @@ bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Mon Feb 1 07:47:03 1999 -+++ applets/charpick/Makefile.in Tue Feb 2 05:59:36 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999 ++++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -42,10 +53,10 @@ bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Mon Feb 1 07:46:58 1999 -+++ applets/clockmail/Makefile.in Tue Feb 2 05:59:54 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999 ++++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -53,10 +64,10 @@ bin_PROGRAMS = clockmail_applet ---- applets/cpumemusage/Makefile.in.orig Mon Feb 1 07:47:14 1999 -+++ applets/cpumemusage/Makefile.in Tue Feb 2 06:00:13 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cpumemusage/Makefile.in.orig Tue Mar 2 01:54:37 1999 ++++ applets/cpumemusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(LIBGTOP_INCS) @@ -64,10 +75,10 @@ bin_PROGRAMS = cpumemusage_applet ---- applets/dialer/Makefile.in.orig Mon Feb 1 07:46:52 1999 -+++ applets/dialer/Makefile.in Tue Feb 2 06:00:34 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999 ++++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -75,10 +86,10 @@ bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Mon Feb 1 07:47:15 1999 -+++ applets/diskusage/Makefile.in Tue Feb 2 06:00:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999 ++++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -86,10 +97,10 @@ bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Mon Feb 1 07:46:56 1999 -+++ applets/drivemount/Makefile.in Tue Feb 2 06:01:10 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999 ++++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -97,10 +108,10 @@ bin_PROGRAMS = drivemount_applet ---- applets/esd-manager/Makefile.in.orig Mon Feb 1 07:47:12 1999 -+++ applets/esd-manager/Makefile.in Tue Feb 2 06:01:26 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999 ++++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) @@ -108,10 +119,10 @@ bin_PROGRAMS = esdmanager_applet ---- applets/fifteen/Makefile.in.orig Mon Feb 1 07:46:59 1999 -+++ applets/fifteen/Makefile.in Tue Feb 2 06:01:43 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999 ++++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -119,10 +130,10 @@ bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Mon Feb 1 07:46:51 1999 -+++ applets/fish/Makefile.in Tue Feb 2 06:01:58 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999 ++++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -130,21 +141,24 @@ #if DO_EXE ---- applets/fvwm-pager/Makefile.in.orig Mon Feb 1 07:47:32 1999 -+++ applets/fvwm-pager/Makefile.in Tue Feb 2 06:02:15 1999 -@@ -151,7 +151,7 @@ +--- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999 ++++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -153,9 +153,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = fvwm-pager ---- applets/gen_util/Makefile.in.orig Mon Feb 1 07:46:46 1999 -+++ applets/gen_util/Makefile.in Tue Feb 2 06:07:49 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999 ++++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -152,9 +166,9 @@ bin_PROGRAMS = gen_util_applet ---- applets/gkb/Makefile.in.orig Fri Feb 19 03:47:32 1999 -+++ applets/gkb/Makefile.in Fri Feb 19 03:47:52 1999 -@@ -152,7 +152,7 @@ +--- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999 ++++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ cxxflags_set = @cxxflags_set@ l = @l@ @@ -163,10 +177,10 @@ #if DO_EXE ---- applets/gnome-pager/Makefile.in.orig Mon Feb 1 07:47:04 1999 -+++ applets/gnome-pager/Makefile.in Tue Feb 2 06:02:53 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999 ++++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -174,10 +188,30 @@ bin_PROGRAMS = gnomepager_applet ---- applets/mini-commander/src/Makefile.in.orig Tue Feb 2 06:03:17 1999 -+++ applets/mini-commander/src/Makefile.in Tue Feb 2 06:03:29 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mini-commander/docs/Makefile.in.orig Tue Mar 2 01:54:17 1999 ++++ applets/mini-commander/docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-docdir = $(datadir)/gnome/help/mini-commander_applet/C ++docdir = $(datadir)/help/mini-commander_applet/C + + # .html files which are generated by db2html; precompiled .html files + # are included, so people without db2html (the DocBook to HTML converter) +@@ -247,7 +247,7 @@ + install: install-am + uninstall-am: uninstall-docDATA + uninstall: uninstall-am +-all-am: Makefile $(DATA) ++all-am: Makefile + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999 ++++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -185,10 +219,10 @@ bin_PROGRAMS = mini_commander_applet ---- applets/mixer/Makefile.in.orig Tue Feb 2 06:03:35 1999 -+++ applets/mixer/Makefile.in Tue Feb 2 06:03:45 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999 ++++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -196,10 +230,10 @@ bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Tue Feb 2 06:03:50 1999 -+++ applets/modemlights/Makefile.in Tue Feb 2 06:04:01 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999 ++++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -207,10 +241,10 @@ bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Tue Feb 2 06:04:06 1999 -+++ applets/multiload/Makefile.in Tue Feb 2 06:04:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999 ++++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -218,10 +252,10 @@ bin_PROGRAMS = multiload_applet ---- applets/netload/Makefile.in.orig Tue Feb 2 06:04:23 1999 -+++ applets/netload/Makefile.in Tue Feb 2 06:04:33 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999 ++++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -229,10 +263,10 @@ bin_PROGRAMS = netload_applet ---- applets/slashapp/Makefile.in.orig Tue Feb 2 06:04:37 1999 -+++ applets/slashapp/Makefile.in Tue Feb 2 06:04:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999 ++++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -240,10 +274,10 @@ bin_PROGRAMS = slash_applet ---- applets/webcontrol/Makefile.in.orig Tue Feb 2 06:04:56 1999 -+++ applets/webcontrol/Makefile.in Tue Feb 2 06:05:06 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999 ++++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -251,10 +285,10 @@ bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Tue Feb 2 06:05:11 1999 -+++ applets/winlist/Makefile.in Tue Feb 2 06:05:23 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999 ++++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -262,10 +296,32 @@ bin_PROGRAMS = winlist_applet ---- gmenu/Makefile.in.orig Tue Feb 2 06:11:35 1999 -+++ gmenu/Makefile.in Tue Feb 2 06:11:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999 ++++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -162,7 +162,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C ++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C + + GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css + +--- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999 ++++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-appsdir = $(datadir)/gnome/apps ++appsdir = $(datadir)/apps + + Rootdir = $(appsdir) + Applicationsdir = $(appsdir)/Applications +--- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999 ++++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) @@ -273,21 +329,53 @@ bin_PROGRAMS = gmenu ---- gnome-terminal/Makefile.in.orig Tue Feb 2 06:12:12 1999 -+++ gnome-terminal/Makefile.in Tue Feb 2 06:12:21 1999 -@@ -153,7 +153,7 @@ +@@ -167,7 +167,7 @@ + + EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm - SUBDIRS = C +-sysdir = $(datadir)/gnome/apps/Settings ++sysdir = $(datadir)/apps/Settings + sys_DATA = gmenu.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999 ++++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C ++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C + + gnome_terminal_help_DATA = index.html topic.dat + +--- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999 ++++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999 +@@ -155,9 +155,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-SUBDIRS = C ++# SUBDIRS = C -INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" +INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lzvt $(INTLLIBS) ---- gsm/Makefile.in.orig Tue Feb 2 06:12:36 1999 -+++ gsm/Makefile.in Tue Feb 2 06:12:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) +@@ -174,7 +174,7 @@ + + CFLAGS = @CFLAGS@ -Wall + +-utildir = $(datadir)/gnome/apps/Utilities ++utildir = $(datadir)/apps/Utilities + util_DATA = gnome-terminal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gsm/Makefile.in.orig Tue Mar 2 01:52:17 1999 ++++ gsm/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(datadir)\"" @@ -295,9 +383,29 @@ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- help-browser/help/C/Makefile.in.orig Tue Feb 2 06:13:57 1999 -+++ help-browser/help/C/Makefile.in Tue Feb 2 06:14:14 1999 -@@ -153,7 +153,7 @@ +--- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999 ++++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -156,7 +156,7 @@ + + SUBDIRS = help gnome-man2html gnome-info2html + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" + + + LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) +@@ -197,7 +197,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = help-browser.gnorba + +-sysdir = $(datadir)/gnome/apps ++sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999 ++++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat @@ -306,9 +414,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue Feb 2 06:14:18 1999 -+++ help-browser/help/es/Makefile.in Tue Feb 2 06:14:27 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999 ++++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -317,9 +425,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue Feb 2 06:14:31 1999 -+++ help-browser/help/fr/Makefile.in Tue Feb 2 06:14:40 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999 ++++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -328,9 +436,42 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Tue Feb 2 06:15:25 1999 -+++ panel/Makefile.in Tue Feb 2 06:15:58 1999 -@@ -156,7 +156,7 @@ +--- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999 ++++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu ++help_browser_helpdir = $(datadir)/help/help-browser/hu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999 ++++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it ++help_browser_helpdir = $(datadir)/help/help-browser/it + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999 ++++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no ++help_browser_helpdir = $(datadir)/help/help-browser/no + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- panel/Makefile.in.orig Tue Mar 2 01:53:16 1999 ++++ panel/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -160,7 +160,7 @@ AUTOMAKE_OPTIONS = 1.3 @@ -339,7 +480,7 @@ bin_PROGRAMS = panel -@@ -176,7 +176,7 @@ +@@ -180,7 +180,7 @@ libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h panel-types.h @@ -348,19 +489,19 @@ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -198,7 +198,7 @@ +@@ -202,7 +202,7 @@ EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist -confexecdir = $(libdir) -+confexecdir = $(datadir) ++confexecdir = $(sysconfdir) confexec_DATA = appletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers ---- smproxy/Makefile.in.orig Tue Feb 2 06:16:19 1999 -+++ smproxy/Makefile.in Tue Feb 2 06:16:30 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- smproxy/Makefile.in.orig Tue Mar 2 01:52:21 1999 ++++ smproxy/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" @@ -368,108 +509,3 @@ LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- core-docs/Makefile.in.orig Tue Feb 2 06:16:47 1999 -+++ core-docs/Makefile.in Tue Feb 2 06:16:58 1999 -@@ -158,7 +158,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C -+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C - - GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css - ---- po/Makefile.in.in.orig Tue Feb 2 06:17:12 1999 -+++ po/Makefile.in.in Tue Feb 2 06:17:23 1999 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po ---- applets/mini-commander/docs/Makefile.in.orig Tue Feb 2 06:17:44 1999 -+++ applets/mini-commander/docs/Makefile.in Tue Feb 2 06:18:12 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --docdir = $(datadir)/gnome/help/mini-commander_applet/C -+docdir = $(datadir)/help/mini-commander_applet/C - - # .html files which are generated by db2html; precompiled .html files - # are included, so people without db2html (the DocBook to HTML converter) -@@ -243,7 +243,7 @@ - install: install-am - uninstall-am: uninstall-docDATA - uninstall: uninstall-am --all-am: Makefile $(DATA) -+all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- help-browser/Makefile.in.orig Tue Feb 2 06:13:07 1999 -+++ help-browser/Makefile.in Tue Feb 2 06:19:22 1999 -@@ -152,7 +152,7 @@ - - SUBDIRS = help gnome-man2html gnome-info2html - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" - - - LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) ---- gnome-terminal/C/Makefile.in.orig Tue Feb 2 07:21:51 1999 -+++ gnome-terminal/C/Makefile.in Tue Feb 2 07:22:07 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C - - gnome_terminal_help_DATA = index.html topic.dat - ---- applets/cpumemusage/proc.c.orig Fri Feb 19 04:07:15 1999 -+++ applets/cpumemusage/proc.c Fri Feb 19 04:07:29 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/cpu.h> - #include <glibtop/mem.h> ---- applets/diskusage/diskusage_read.c.orig Fri Feb 19 04:09:00 1999 -+++ applets/diskusage/diskusage_read.c Fri Feb 19 04:09:13 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/fsusage.h> - #include <glibtop/mountlist.h> ---- applets/Makefile.in.orig Fri Feb 19 04:43:52 1999 -+++ applets/Makefile.in Fri Feb 19 04:44:40 1999 -@@ -152,13 +152,13 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb -+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb - - @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager - @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = - - @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager --@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload -+@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload - @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS = - - @HAVE_LIBGHTTP_TRUE@slashapp = slashapp -@@ -174,7 +174,7 @@ - SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) $(cdplayer) $(mixer) $(modemlights) $(winlist) $(slashapp) $(esdmanager) $(fvwm) - - --DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload netload slashapp cdplayer mixer modemlights winlist fvwm-pager -+DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload slashapp cdplayer mixer modemlights winlist fvwm-pager - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist index 1156beda4fd1..ec18080d5f2c 100644 --- a/x11/gnomecore/pkg-plist +++ b/x11/gnomecore/pkg-plist @@ -1,5 +1,6 @@ bin/asclock_applet bin/battery_applet +bin/cdplayer_applet bin/charpick_applet bin/clockmail_applet bin/cpumemusage_applet @@ -8,6 +9,7 @@ bin/diskusage_applet bin/fifteen_applet bin/gen_util_applet bin/gmenu +bin/gnome-edit bin/gnome-help-browser bin/gnome-help-caller bin/gnome-info2html @@ -16,17 +18,18 @@ bin/gnome-session bin/gnome-smproxy bin/gnome-terminal bin/gnomepager_applet +bin/jbc_applet bin/mini_commander_applet bin/mixer_applet bin/modemlights_applet bin/multiload_applet bin/panel bin/save-session -bin/session-properties bin/slash_applet bin/webcontrol_applet etc/CORBA/servers/asclock_applet.gnorba etc/CORBA/servers/battery_applet.gnorba +etc/CORBA/servers/cdplayer_applet.gnorba etc/CORBA/servers/charpick_applet.gnorba etc/CORBA/servers/clockmail_applet.gnorba etc/CORBA/servers/cpumemusage_applet.gnorba @@ -38,6 +41,7 @@ etc/CORBA/servers/gen_util.gnorba etc/CORBA/servers/gkb_applet.gnorba etc/CORBA/servers/gnomepager_applet.gnorba etc/CORBA/servers/help-browser.gnorba +etc/CORBA/servers/jbc_applet.gnorba etc/CORBA/servers/mini-commander_applet.gnorba etc/CORBA/servers/mixer_applet.gnorba etc/CORBA/servers/modemlights_applet.gnorba @@ -45,6 +49,7 @@ etc/CORBA/servers/multiload_applet.gnorba etc/CORBA/servers/panel.gnorba etc/CORBA/servers/slash_applet.gnorba etc/CORBA/servers/webcontrol_applet.gnorba +etc/appletsConf.sh etc/sound/events/panel.soundlist include/applet-widget.h include/gnome-panel.h @@ -63,7 +68,6 @@ lib/libpanel_applet.so lib/libpanel_applet.so.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -share/gnome/appletsConf.sh share/gnome/applets/Amusements/.directory share/gnome/applets/Amusements/fifteen_applet.desktop share/gnome/applets/Amusements/fish_applet.desktop @@ -76,6 +80,7 @@ share/gnome/applets/Monitors/diskusage_applet.desktop share/gnome/applets/Monitors/memload_applet.desktop share/gnome/applets/Monitors/swapload_applet.desktop share/gnome/applets/Multimedia/.directory +share/gnome/applets/Multimedia/cdplayer_applet.desktop share/gnome/applets/Multimedia/mixer_applet.desktop share/gnome/applets/Network/.directory share/gnome/applets/Network/dialer_applet.desktop @@ -89,26 +94,26 @@ share/gnome/applets/Utility/clock_applet.desktop share/gnome/applets/Utility/clockmail_applet.desktop share/gnome/applets/Utility/gkb_applet.desktop share/gnome/applets/Utility/gnomepager_applet.desktop +share/gnome/applets/Utility/jbc_applet.desktop share/gnome/applets/Utility/mini-commander_applet.desktop share/gnome/applets/Utility/printer.desktop share/gnome/apps/.order -share/gnome/apps/Administration/.directory share/gnome/apps/Applications/.directory share/gnome/apps/Applications/Emacs.desktop share/gnome/apps/Applications/Netscape.desktop -share/gnome/apps/Audio/.directory share/gnome/apps/Games/.directory share/gnome/apps/Gmc.desktop share/gnome/apps/Graphics/.directory share/gnome/apps/Graphics/GIMP.desktop -share/gnome/apps/Network/.directory -share/gnome/apps/Network/Balsa.desktop -share/gnome/apps/Network/Tkrat.desktop -share/gnome/apps/Productivity/.directory +share/gnome/apps/Internet/.directory +share/gnome/apps/Internet/Balsa.desktop +share/gnome/apps/Internet/Tkrat.desktop +share/gnome/apps/Multimedia/.directory +share/gnome/apps/Settings/.directory +share/gnome/apps/Settings/.order +share/gnome/apps/Settings/Imlib_config.desktop +share/gnome/apps/Settings/gmenu.desktop share/gnome/apps/System/.directory -share/gnome/apps/System/Imlib_config.desktop -share/gnome/apps/System/gmenu.desktop -share/gnome/apps/System/session.desktop share/gnome/apps/Utilities/.directory share/gnome/apps/Utilities/Eterm.desktop share/gnome/apps/Utilities/Kterm.desktop @@ -166,19 +171,6 @@ share/gnome/help/gnome-intro/C/pix/panel-menu.gif share/gnome/help/gnome-intro/C/pix/same-gnome.gif share/gnome/help/gnome-intro/C/pix/terminal.gif share/gnome/help/gnome-intro/C/topic.dat -share/gnome/help/gnome-terminal/C/authors.html -share/gnome/help/gnome-terminal/C/classes.html -share/gnome/help/gnome-terminal/C/config.html -share/gnome/help/gnome-terminal/C/docbook.css -share/gnome/help/gnome-terminal/C/emulation.html -share/gnome/help/gnome-terminal/C/enviroment.html -share/gnome/help/gnome-terminal/C/index.html -share/gnome/help/gnome-terminal/C/menus.html -share/gnome/help/gnome-terminal/C/options.html -share/gnome/help/gnome-terminal/C/pointerusage.html -share/gnome/help/gnome-terminal/C/terminal.html -share/gnome/help/gnome-terminal/C/termtech.html -share/gnome/help/gnome-terminal/C/topic.dat share/gnome/help/help-browser/C/default-page.html share/gnome/help/help-browser/C/gnome-logo-large.png share/gnome/help/help-browser/C/help-browser.html @@ -192,6 +184,19 @@ share/gnome/help/help-browser/fr/default-page.html share/gnome/help/help-browser/fr/help-browser.html share/gnome/help/help-browser/fr/index.html share/gnome/help/help-browser/fr/topic.dat +share/gnome/help/help-browser/hu/default-page.html +share/gnome/help/help-browser/hu/gnome-logo-large.png +share/gnome/help/help-browser/hu/help-browser.html +share/gnome/help/help-browser/hu/index.html +share/gnome/help/help-browser/hu/topic.dat +share/gnome/help/help-browser/it/default-page.html +share/gnome/help/help-browser/it/help-browser.html +share/gnome/help/help-browser/it/index.html +share/gnome/help/help-browser/it/topic.dat +share/gnome/help/help-browser/no/default-page.html +share/gnome/help/help-browser/no/help-browser.html +share/gnome/help/help-browser/no/index.html +share/gnome/help/help-browser/no/topic.dat share/gnome/help/mini-commander_applet/C/change-log.html share/gnome/help/mini-commander_applet/C/clock.html share/gnome/help/mini-commander_applet/C/command-completion.html @@ -352,6 +357,7 @@ share/gnome/xmodmap/xmodmap.nl share/gnome/xmodmap/xmodmap.no share/gnome/xmodmap/xmodmap.pl share/gnome/xmodmap/xmodmap.pt +share/gnome/xmodmap/xmodmap.pt-dead share/gnome/xmodmap/xmodmap.qc share/gnome/xmodmap/xmodmap.ru share/gnome/xmodmap/xmodmap.ru_koi8 @@ -372,13 +378,7 @@ share/locale/cs/LC_MESSAGES/gnome-core.mo share/locale/da/LC_MESSAGES/gnome-core.mo share/locale/de/LC_MESSAGES/gnome-core.mo share/locale/es/LC_MESSAGES/gnome-core.mo -share/locale/es_DO/LC_MESSAGES/gnome-core.mo -share/locale/es_GT/LC_MESSAGES/gnome-core.mo -share/locale/es_HN/LC_MESSAGES/gnome-core.mo share/locale/es_MX/LC_MESSAGES/gnome-core.mo -share/locale/es_PA/LC_MESSAGES/gnome-core.mo -share/locale/es_PE/LC_MESSAGES/gnome-core.mo -share/locale/es_SV/LC_MESSAGES/gnome-core.mo share/locale/fi/LC_MESSAGES/gnome-core.mo share/locale/fr/LC_MESSAGES/gnome-core.mo share/locale/ga/LC_MESSAGES/gnome-core.mo @@ -392,41 +392,41 @@ share/locale/pl/LC_MESSAGES/gnome-core.mo share/locale/pt/LC_MESSAGES/gnome-core.mo share/locale/ru/LC_MESSAGES/gnome-core.mo share/locale/sv/LC_MESSAGES/gnome-core.mo -@dirrm etc/CORBA/servers -@dirrm etc/CORBA -@dirrm share/gnome/applets/Amusements -@dirrm share/gnome/applets/Monitors -@dirrm share/gnome/applets/Multimedia -@dirrm share/gnome/applets/Network -@dirrm share/gnome/applets/Utility -@dirrm share/gnome/applets -@dirrm share/gnome/apps/Administration -@dirrm share/gnome/apps/Applications -@dirrm share/gnome/apps/Audio -@dirrm share/gnome/apps/Games -@dirrm share/gnome/apps/Graphics -@dirrm share/gnome/apps/Network -@dirrm share/gnome/apps/Productivity -@dirrm share/gnome/apps/System -@dirrm share/gnome/apps/Utilities -@dirrm share/gnome/apps +@dirrm share/gnome/xmodmap +@dirrm share/gnome/pixmaps/tiles +@dirrm share/gnome/pixmaps/mini-commander +@dirrm share/gnome/pixmaps/mailcheck +@dirrm share/gnome/pixmaps/gkb +@dirrm share/gnome/pixmaps/fish +@dirrm share/gnome/mc/templates +@dirrm share/gnome/mc +@dirrm share/gnome/help/mini-commander_applet/C +@dirrm share/gnome/help/mini-commander_applet +@dirrm share/gnome/help/help-browser/no +@dirrm share/gnome/help/help-browser/it +@dirrm share/gnome/help/help-browser/hu +@dirrm share/gnome/help/help-browser/fr +@dirrm share/gnome/help/help-browser/es +@dirrm share/gnome/help/help-browser/C +@dirrm share/gnome/help/help-browser @dirrm share/gnome/help/gnome-intro/C/pix @dirrm share/gnome/help/gnome-intro/C @dirrm share/gnome/help/gnome-intro -@dirrm share/gnome/help/gnome-terminal/C -@dirrm share/gnome/help/gnome-terminal -@dirrm share/gnome/help/help-browser/C -@dirrm share/gnome/help/help-browser/es -@dirrm share/gnome/help/help-browser/fr -@dirrm share/gnome/help/help-browser -@dirrm share/gnome/help/mini-commander_applet/C -@dirrm share/gnome/help/mini-commander_applet @dirrm share/gnome/help -@dirrm share/gnome/mc/templates -@dirrm share/gnome/mc -@dirrm share/gnome/pixmaps/gkb -@dirrm share/gnome/pixmaps/fish -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/tiles -@dirrm share/gnome/xmodmap +@dirrm share/gnome/apps/Utilities +@dirrm share/gnome/apps/System +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps/Multimedia +@dirrm share/gnome/apps/Internet +@dirrm share/gnome/apps/Graphics +@dirrm share/gnome/apps/Games +@dirrm share/gnome/apps/Applications +@dirrm share/gnome/apps +@dirrm share/gnome/applets/Utility +@dirrm share/gnome/applets/Network +@dirrm share/gnome/applets/Multimedia +@dirrm share/gnome/applets/Monitors +@dirrm share/gnome/applets/Amusements +@dirrm share/gnome/applets +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/gnomelibs/distinfo +++ b/x11/gnomelibs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/gnomelibs/files/patch-ac +++ b/x11/gnomelibs/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ 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 -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ 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 -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@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 diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 61e7c65fd0fd..39dccdb790ba 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -1,16 +1,16 @@ # New ports collection makefile for: gnomelibs -# Version required: 0.99.8.1 +# Version required: 1.0.1 # Date created: 17 June 1998 # Whom: Yukihiro Nakai <Nakai@technologist.com> # -# $Id: Makefile,v 1.31 1999/02/01 20:58:45 vanilla Exp $ +# $Id: Makefile,v 1.32 1999/02/18 17:53:23 vanilla Exp $ # -DISTNAME= gnome-libs-0.99.8.1 -PKGNAME= gnomelibs-0.99.8.1 +DISTNAME= gnome-libs-1.0.1 +PKGNAME= gnomelibs-1.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= gnome-libs +MASTER_SITE_SUBDIR= gnome-1.0/sources MAINTAINER= nacai@iname.com @@ -20,7 +20,7 @@ LIB_DEPENDS= gdk_imlib.2:${PORTSDIR}/graphics/imlib \ esd.1:${PORTSDIR}/audio/esound # implicit dependencies: -# gettext, gtk11-devel, tiff34, jpeg, giflib, png +# gettext, gtk12, tiff34, jpeg, giflib, png USE_X_PREFIX= yes USE_PERL5= yes @@ -30,9 +30,9 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ --disable-gnome-hello \ --disable-test-gnome -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include \ - -I${X11BASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \ +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include/giflib" \ + GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4" post-install: diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index f7e1fd302f48..455cc546ff06 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-0.99.8.1.tar.gz) = 1f11250f9fd5c9632e1b0e920d250d31 +MD5 (gnome-libs-1.0.1.tar.gz) = ec15a4281426ea664d501edc3fdba47f diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index cfa5a37c0dc2..02ba2b3b8c3c 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,6 +1,6 @@ ---- configure.orig Tue Feb 16 00:40:19 1999 -+++ configure Fri Feb 19 00:19:26 1999 -@@ -5137,7 +5137,7 @@ +--- configure.orig Mon Mar 1 21:51:08 1999 ++++ configure Sat Mar 6 13:33:05 1999 +@@ -5149,7 +5149,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -9,59 +9,17 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6747,7 +6747,7 @@ +@@ -7233,7 +7233,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 6753 "configure" + #line 7239 "configure" #include "confdefs.h" -@@ -7001,16 +7001,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7007: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7007: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7012 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -7077,16 +7077,16 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 --echo "configure:7083: checking for gif_lib.h" >&5 -+ ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:7083: checking for giflib/gif_lib.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF - #line 7088 "configure" - #include "confdefs.h" --#include <gif_lib.h> -+#include <giflib/gif_lib.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:7093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -10218,7 +10218,7 @@ - ZVT_LIBS="-lzvt $GTK_LIBS" +@@ -10704,7 +10704,7 @@ + ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS" GNOME_LIBDIR='-L${libdir}' -GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include' @@ -69,3 +27,14 @@ GNOME_IDLDIR='-I${datadir}/idl' +@@ -11548,10 +11548,6 @@ + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac +- case "$ac_given_INSTALL" in +- [/$]*) INSTALL="$ac_given_INSTALL" ;; +- *) INSTALL="$ac_dots$ac_given_INSTALL" ;; +- esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac index 91dbb7fa8ed8..be621cf51bcc 100644 --- a/x11/libgnome/files/patch-ac +++ b/x11/libgnome/files/patch-ac @@ -1,42 +1,49 @@ ---- gnome-config.in.orig Wed Jan 13 07:42:48 1999 -+++ gnome-config.in Fri Jan 15 00:02:56 1999 -@@ -41,18 +41,18 @@ +--- gnome-config.in.orig Mon Feb 15 20:05:33 1999 ++++ gnome-config.in Tue Mar 2 09:00:51 1999 +@@ -43,25 +43,25 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib11d (calls glib11d-config) ++ glib (calls glib12-config) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk11d (calls gtk11d-config) ++ gtk (calls gtk12-config) gtkxmhtml (only --libs) zvt (only --libs) If LIBRARY is none of these, - ${libdir}/<LIBRARY>Conf.sh -+ ${datadir}/<LIBRARY>Conf.sh ++ ${sysconfdir}/<LIBRARY>Conf.sh + + is looked in for the necessary information. Those currently installed + appear to be: - is looked in for the necessary information. EOF -@@ -114,33 +114,33 @@ + +- conf_shs=`cd ${libdir}; echo *Conf.sh` ++ conf_shs=`cd ${sysconfdir}; echo *Conf.sh` + + if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then + echo " <NONE>" +@@ -146,36 +146,36 @@ usage 1 ;; glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib11d-config --libs`" -+ the_flags="$the_flags `glib11d-config --cflags`" ++ the_libs="$the_libs `glib12-config --libs`" ++ the_flags="$the_flags `glib12-config --cflags`" ;; -- gtk) + gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ gtk11) -+ the_libs="$the_libs `gtk11d-config --libs`" -+ the_flags="$the_flags `gtk11d-config --cflags`" ++ the_libs="$the_libs `gtk12-config --libs`" ++ the_flags="$the_flags `gtk12-config --cflags`" ;; gnome) - the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" @@ -65,4 +72,8 @@ + the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl" ;; *) - cnf_sh=${libdir}/${1}Conf.sh +- cnf_sh=${libdir}/${1}Conf.sh ++ cnf_sh=${sysconfdir}/${1}Conf.sh + if test -f ${cnf_sh}; then + . ${cnf_sh} + up_name=`echo $1 | tr a-z A-Z` diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 5ac61c20790c..021e4eabd18b 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -9,6 +9,8 @@ bin/goad-browser bin/libart-config bin/loadshlib bin/new-object +etc/gnomeConf.sh +etc/libartConf.sh etc/mime-magic etc/mime-magic.dat etc/paper.config @@ -16,7 +18,6 @@ etc/sound/events/gnome.soundlist etc/sound/events/gtk-events.soundlist include/gnome.h include/gnomesupport.h -include/popt-gnome.h include/gtk-xmhtml/HTML.h include/gtk-xmhtml/XmHTML.h include/gtk-xmhtml/XmHTMLI.h @@ -32,8 +33,8 @@ include/libart_lgpl/art_filterlevel.h include/libart_lgpl/art_gray_svp.h include/libart_lgpl/art_misc.h include/libart_lgpl/art_pathcode.h -include/libart_lgpl/art_point.h include/libart_lgpl/art_pixbuf.h +include/libart_lgpl/art_point.h include/libart_lgpl/art_rect.h include/libart_lgpl/art_rect_svp.h include/libart_lgpl/art_rect_uta.h @@ -152,6 +153,7 @@ include/libgnomeui/gtkpixmapmenuitem.h include/libgnomeui/libgnomeui.h include/libgnorba/gnome-factory.h include/libgnorba/gnorba.h +include/popt-gnome.h include/zvt/lists.h include/zvt/vt.h include/zvt/vtx.h @@ -190,15 +192,14 @@ 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 -share/gnome/gnomeConf.sh share/gnome/gtkrc share/gnome/gtkrc.ja share/gnome/gtkrc.ko +share/gnome/gtkrc.ru share/gnome/idl/Table.idl share/gnome/idl/base.idl share/gnome/idl/gnome-factory.idl share/gnome/idl/name-service.idl -share/gnome/libartConf.sh share/gnome/mime-info/gnome.mime share/gnome/pixmaps/calculator-font.png share/gnome/pixmaps/gnome-default-dlg.png @@ -208,6 +209,8 @@ share/gnome/pixmaps/gnome-question.png share/gnome/pixmaps/gnome-warning.png share/gnome/pixmaps/no.xpm share/gnome/pixmaps/yes.xpm +share/gnome/type-convert/gnome-make-postscript-mimes +share/gnome/type-convert/postscript.convert share/gnome/type-convert/type.convert share/locale/ca/LC_MESSAGES/gnome-libs.mo share/locale/cs/LC_MESSAGES/gnome-libs.mo @@ -227,17 +230,18 @@ 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 -@dirrm etc/sound/events -@dirrm etc/sound -@dirrm include/gtk-xmhtml -@dirrm include/libart_lgpl -@dirrm include/libgnome -@dirrm include/libgnomeui -@dirrm include/libgnorba -@dirrm include/zvt -@dirrm share/gnome/games -@dirrm share/gnome/idl -@dirrm share/gnome/mime-info -@dirrm share/gnome/pixmaps +@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 |