summaryrefslogtreecommitdiff
path: root/x11-toolkits/gtk12
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2000-05-25 12:23:48 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2000-05-25 12:23:48 +0000
commit409af62fa8a39d12523bca8b4aed930a064fc00a (patch)
treeb9cbdb00a41df7c12aa3f104f8fe56fdf246d2d4 /x11-toolkits/gtk12
parentmake startup script work (start/stop) (diff)
Update glib/gtk++ to 1.2.8.
Overview of Changes in GTK+ 1.2.8: * GNU Make 3.79 bug workaround * FAQ and tutorial updates and improvements * Miscellaneous bug fixes: CList, Calendar, rc-files, FontSelection Overview of Changes in GLib 1.2.8: * GArray zero initialization bug fixed * Fix for upper bound calculation of formatted strings * Improved GCC detection * AIX dynamic modules fix to retrive symbols from shared libraries for the main program. * Miscellaneous other minor bug fixes
Notes
Notes: svn path=/head/; revision=28746
Diffstat (limited to 'x11-toolkits/gtk12')
-rw-r--r--x11-toolkits/gtk12/Makefile3
-rw-r--r--x11-toolkits/gtk12/distinfo2
-rw-r--r--x11-toolkits/gtk12/files/patch-aa68
-rw-r--r--x11-toolkits/gtk12/files/patch-af11
-rw-r--r--x11-toolkits/gtk12/files/patch-ag29
-rw-r--r--x11-toolkits/gtk12/files/patch-ah39
-rw-r--r--x11-toolkits/gtk12/pkg-plist7
7 files changed, 83 insertions, 76 deletions
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index c31fa7476a09..3f5b9f1dc28f 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gtk
-PORTVERSION= 1.2.7
+PORTVERSION= 1.2.8
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
@@ -35,5 +35,6 @@ MAN1= gtk12-config.1
pre-build:
${PERL} -i -pe 's/\\"$$/\\/' ${WRKSRC}/gtk/gtkrc.*
${RM} -rf ${WRKSRC}/docs/gtk.info*
+# ${CP} ${WRKSRC}/docs/gtk-config.1 ${WRKSRC}/docs/gtk12-config.1
.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk12/distinfo b/x11-toolkits/gtk12/distinfo
index a56ef0f17220..1da36a299c34 100644
--- a/x11-toolkits/gtk12/distinfo
+++ b/x11-toolkits/gtk12/distinfo
@@ -1 +1 @@
-MD5 (gtk+-1.2.7.tar.gz) = cc20b2fc612c30be11cebc430ee39e91
+MD5 (gtk+-1.2.8.tar.gz) = d947ecc5780b4367d4c50fbb019d0216
diff --git a/x11-toolkits/gtk12/files/patch-aa b/x11-toolkits/gtk12/files/patch-aa
index 2174f3059455..e26e9de59f45 100644
--- a/x11-toolkits/gtk12/files/patch-aa
+++ b/x11-toolkits/gtk12/files/patch-aa
@@ -38,71 +38,3 @@
info-am:
info: info-recursive
dvi-am:
---- gtk/Makefile.in.orig Fri Oct 8 10:57:08 1999
-+++ gtk/Makefile.in Tue Oct 12 16:04:29 1999
-@@ -126,7 +126,7 @@
- x_libs = @x_libs@
- xinput_progs = @xinput_progs@
-
--INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -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@ @STRIP_END@
-+INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -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@ @STRIP_END@
-
-
- #
-@@ -191,7 +191,7 @@
- gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
- CLEANFILES = $(gen_sources)
-
--gtkconfdir = $(sysconfdir)/gtk
-+gtkconfdir = $(datadir)/themes/Default/gtk
- gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
-
-
-@@ -504,7 +504,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
- uninstall-libgtkincludeHEADERS uninstall-local
- uninstall: uninstall-am
--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
---- docs/Makefile.in.orig Fri Sep 24 09:13:34 1999
-+++ docs/Makefile.in Sat Oct 9 22:15:26 1999
-@@ -99,7 +99,7 @@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
- MAINT = @MAINT@
--MAKEINFO = @MAKEINFO@
-+MAKEINFO = @MAKEINFO@ --no-split
- MKINSTALLDIRS = @MKINSTALLDIRS@
- NM = @NM@
- OBJDUMP = @OBJDUMP@
-@@ -128,7 +128,7 @@
-
- info_TEXINFOS = gdk.texi gtk.texi
-
--man_MANS = gtk-config.1
-+man_MANS = gtk@LT_RELEASE@-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
-
-@@ -146,7 +146,7 @@
-
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
--CONFIG_CLEAN_FILES = gtk-config.1
-+CONFIG_CLEAN_FILES = gtk@LT_RELEASE@-config.1
- TEXI2DVI = texi2dvi
- INFO_DEPS = gdk.info gtk.info
- DVIS = gdk.dvi gtk.dvi
-@@ -174,6 +174,9 @@
-
- gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+gtk@LT_RELEASE@-config.1: gtk-config.1
-+ cp gtk-config.1 gtk@LT_RELEASE@-config.1
-
- gdk.info: gdk.texi
- gdk.dvi: gdk.texi
diff --git a/x11-toolkits/gtk12/files/patch-af b/x11-toolkits/gtk12/files/patch-af
index 383313abc77d..e0750ce3a9a1 100644
--- a/x11-toolkits/gtk12/files/patch-af
+++ b/x11-toolkits/gtk12/files/patch-af
@@ -1,12 +1,11 @@
---- gtk/gtkrc.ru.orig Wed Feb 16 20:18:08 2000
-+++ gtk/gtkrc.ru Tue Apr 25 19:22:20 2000
+--- gtk/gtkrc.ru.orig Fri May 19 08:18:08 2000
++++ gtk/gtkrc.ru Thu May 25 13:55:53 2000
@@ -1,7 +1,7 @@
style "gtk-default-ru" {
fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-- -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\"
-- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\"
-+ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+ -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
+ -*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
- -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r"
+ -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*"
}
class "GtkWidget" style "gtk-default-ru"
diff --git a/x11-toolkits/gtk12/files/patch-ag b/x11-toolkits/gtk12/files/patch-ag
new file mode 100644
index 000000000000..d7f31e549e84
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-ag
@@ -0,0 +1,29 @@
+--- gtk/Makefile.in.orig Thu May 25 04:11:04 2000
++++ gtk/Makefile.in Thu May 25 13:49:05 2000
+@@ -125,7 +125,7 @@
+ x_libs = @x_libs@
+ xinput_progs = @xinput_progs@
+
+-INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -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@ @STRIP_END@
++INCLUDES = @STRIP_BEGIN@ -DG_LOG_DOMAIN=\"Gtk\" -DGTK_DISABLE_COMPAT_H -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@ @STRIP_END@
+
+
+ #
+@@ -190,7 +190,7 @@
+ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
+ CLEANFILES = $(gen_sources)
+
+-gtkconfdir = $(sysconfdir)/gtk
++gtkconfdir = $(datadir)/themes/Default/gtk
+ gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1255
+
+
+@@ -503,7 +503,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \
+ uninstall-libgtkincludeHEADERS uninstall-local
+ uninstall: uninstall-am
+-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
diff --git a/x11-toolkits/gtk12/files/patch-ah b/x11-toolkits/gtk12/files/patch-ah
new file mode 100644
index 000000000000..b0b87b71e8bc
--- /dev/null
+++ b/x11-toolkits/gtk12/files/patch-ah
@@ -0,0 +1,39 @@
+--- docs/Makefile.in.orig Fri Sep 24 09:13:34 1999
++++ docs/Makefile.in Sat Oct 9 22:15:26 1999
+@@ -99,7 +99,7 @@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
+ MAINT = @MAINT@
+-MAKEINFO = @MAKEINFO@
++MAKEINFO = @MAKEINFO@ --no-split
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ NM = @NM@
+ OBJDUMP = @OBJDUMP@
+@@ -128,7 +128,7 @@
+
+ info_TEXINFOS = gdk.texi gtk.texi
+
+-man_MANS = gtk-config.1
++man_MANS = gtk@LT_RELEASE@-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
+
+@@ -146,7 +146,7 @@
+
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+-CONFIG_CLEAN_FILES = gtk-config.1
++CONFIG_CLEAN_FILES = gtk@LT_RELEASE@-config.1
+ TEXI2DVI = texi2dvi
+ INFO_DEPS = gdk.info gtk.info
+ DVIS = gdk.dvi gtk.dvi
+@@ -174,6 +174,9 @@
+
+ gtk-config.1: $(top_builddir)/config.status gtk-config.1.in
+ cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++
++gtk@LT_RELEASE@-config.1: gtk-config.1
++ cp gtk-config.1 gtk@LT_RELEASE@-config.1
+
+ gdk.info: gdk.texi
+ gdk.dvi: gdk.texi
diff --git a/x11-toolkits/gtk12/pkg-plist b/x11-toolkits/gtk12/pkg-plist
index b78a9e0e5edb..bac40e9475d7 100644
--- a/x11-toolkits/gtk12/pkg-plist
+++ b/x11-toolkits/gtk12/pkg-plist
@@ -153,6 +153,7 @@ share/locale/ja/LC_MESSAGES/gtk+.mo
share/locale/ko/LC_MESSAGES/gtk+.mo
share/locale/lt/LC_MESSAGES/gtk+.mo
share/locale/nl/LC_MESSAGES/gtk+.mo
+share/locale/nn/LC_MESSAGES/gtk+.mo
share/locale/no/LC_MESSAGES/gtk+.mo
share/locale/pl/LC_MESSAGES/gtk+.mo
share/locale/pt/LC_MESSAGES/gtk+.mo
@@ -168,6 +169,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
share/themes/Default/gtk/gtkrc
share/themes/Default/gtk/gtkrc.bg
share/themes/Default/gtk/gtkrc.bg_BG.iso88595
+share/themes/Default/gtk/gtkrc.cp1255
share/themes/Default/gtk/gtkrc.cs
share/themes/Default/gtk/gtkrc.cy
share/themes/Default/gtk/gtkrc.el
@@ -175,6 +177,8 @@ share/themes/Default/gtk/gtkrc.eo
share/themes/Default/gtk/gtkrc.et
share/themes/Default/gtk/gtkrc.ga
share/themes/Default/gtk/gtkrc.he
+share/themes/Default/gtk/gtkrc.he_IL.cp1255
+share/themes/Default/gtk/gtkrc.he_IL.microsoftcp1255
share/themes/Default/gtk/gtkrc.hr
share/themes/Default/gtk/gtkrc.hu
share/themes/Default/gtk/gtkrc.hy
@@ -189,6 +193,7 @@ share/themes/Default/gtk/gtkrc.ka_GE.georgianacademy
share/themes/Default/gtk/gtkrc.ka_GE.georgianps
share/themes/Default/gtk/gtkrc.ko
share/themes/Default/gtk/gtkrc.lt
+share/themes/Default/gtk/gtkrc.lv
share/themes/Default/gtk/gtkrc.mk
share/themes/Default/gtk/gtkrc.pl
share/themes/Default/gtk/gtkrc.ro
@@ -196,6 +201,7 @@ share/themes/Default/gtk/gtkrc.ru
share/themes/Default/gtk/gtkrc.ru_RU.iso88595
share/themes/Default/gtk/gtkrc.sk
share/themes/Default/gtk/gtkrc.sl
+share/themes/Default/gtk/gtkrc.sp
share/themes/Default/gtk/gtkrc.sq
share/themes/Default/gtk/gtkrc.sr
share/themes/Default/gtk/gtkrc.th
@@ -206,6 +212,7 @@ share/themes/Default/gtk/gtkrc.vi_VN.tcvn
share/themes/Default/gtk/gtkrc.vi_VN.tcvn5712
share/themes/Default/gtk/gtkrc.vi_VN.viscii
share/themes/Default/gtk/gtkrc.vi_VN.viscii111
+share/themes/Default/gtk/gtkrc.yi
share/themes/Default/gtk/gtkrc.zh_CN
share/themes/Default/gtk/gtkrc.zh_TW.Big5
@dirrm share/themes/Default/gtk