diff options
author | tron <tron> | 1999-03-04 08:54:37 +0000 |
---|---|---|
committer | tron <tron> | 1999-03-04 08:54:37 +0000 |
commit | a4e96517d38de32b035a8eb928481669c3af456c (patch) | |
tree | 4aafcf924b165cebe30ef432b1e8d320d4d1127d | |
parent | c7500f8b47e64c73ece0face6037be30ff0a7da3 (diff) | |
download | pkgsrc-a4e96517d38de32b035a8eb928481669c3af456c.tar.gz |
Update "gtk+" package to release version 1.2.0.
-rw-r--r-- | x11/gtk/Makefile | 16 | ||||
-rw-r--r-- | x11/gtk/files/md5 | 4 | ||||
-rw-r--r-- | x11/gtk/patches/patch-aa | 28 | ||||
-rw-r--r-- | x11/gtk/patches/patch-ab | 24 | ||||
-rw-r--r-- | x11/gtk/patches/patch-ac | 23 | ||||
-rw-r--r-- | x11/gtk/patches/patch-ad | 13 | ||||
-rw-r--r-- | x11/gtk/pkg/PLIST | 57 |
7 files changed, 88 insertions, 77 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index b7fb96ec06b..4460a11996c 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,18 +1,18 @@ -# $NetBSD: Makefile,v 1.27 1999/02/20 22:48:47 hubertf Exp $ +# $NetBSD: Makefile,v 1.28 1999/03/04 08:54:37 tron Exp $ -DISTNAME= gtk+-1.1.12 +DISTNAME= gtk+-1.2.0 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.1/ \ - ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.1/ \ - http://www.ameth.org/gimp/pub/gtk/v1.1/ \ - ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.1/ +MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.2/ \ + ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \ + http://www.ameth.org/gimp/pub/gtk/v1.2/ \ + ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.2/ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.gtk.org/ DEPENDS+= gettext-0.10.35:../../devel/gettext -DEPENDS+= glib-1.1.12:../../devel/glib -BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5 +DEPENDS+= glib-1.2.0:../../devel/glib +BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_LIBTOOL= yes USE_X11BASE= yes diff --git a/x11/gtk/files/md5 b/x11/gtk/files/md5 index aa60943f46c..3cc6e36773d 100644 --- a/x11/gtk/files/md5 +++ b/x11/gtk/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.9 1999/01/16 01:43:30 tron Exp $ +$NetBSD: md5,v 1.10 1999/03/04 08:54:37 tron Exp $ -MD5 (gtk+-1.1.12.tar.gz) = e8430577fe750e463db2238d6190281e +MD5 (gtk+-1.2.0.tar.gz) = d935cf94a4b0167b6b3570580a1013b9 diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa index 0640b61cd1e..25c09fa842b 100644 --- a/x11/gtk/patches/patch-aa +++ b/x11/gtk/patches/patch-aa @@ -1,21 +1,29 @@ -$NetBSD: patch-aa,v 1.6 1998/08/07 11:18:05 agc Exp $ +$NetBSD: patch-aa,v 1.7 1999/03/04 08:54:37 tron Exp $ ---- configure.orig Tue Jun 2 01:31:51 1998 -+++ configure Sat Jul 18 10:44:53 1998 -@@ -1231,6 +1231,7 @@ - echo "$ac_t""no" 1>&6 +--- configure.orig Thu Feb 25 12:02:28 1999 ++++ configure Thu Mar 4 00:01:06 1999 +@@ -1600,6 +1600,7 @@ + ac_tool_prefix= fi +if false; then # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' -@@ -1276,7 +1277,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ +@@ -1832,6 +1833,7 @@ + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -- +fi - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 - echo "configure:1283: checking whether to enable maintainer-specific portions of Makefiles" >&5 + # Redirect the config.log output again, so that the ltconfig log is not + # clobbered by the next message. +@@ -4444,7 +4446,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 diff --git a/x11/gtk/patches/patch-ab b/x11/gtk/patches/patch-ab index 8c23830dc56..41749257304 100644 --- a/x11/gtk/patches/patch-ab +++ b/x11/gtk/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.8 1998/12/18 23:53:16 tron Exp $ +$NetBSD: patch-ab,v 1.9 1999/03/04 08:54:37 tron Exp $ ---- gdk/Makefile.in.orig Thu Dec 17 07:33:51 1998 -+++ gdk/Makefile.in Fri Dec 18 23:50:07 1998 -@@ -180,7 +180,7 @@ - -lm - - libgdk_la_LDFLAGS = \ -- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ -+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - @GLIB_LIBS@ \ - @x_ldflags@ \ - @x_libs@ \ +--- gdk/Makefile.in.orig Thu Feb 25 21:15:33 1999 ++++ gdk/Makefile.in Wed Mar 3 23:33:09 1999 +@@ -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 ++libgdk_la_LDFLAGS = -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm + + + EXTRA_PROGRAMS = gxid diff --git a/x11/gtk/patches/patch-ac b/x11/gtk/patches/patch-ac index 4045034b571..1044ef4c3a9 100644 --- a/x11/gtk/patches/patch-ac +++ b/x11/gtk/patches/patch-ac @@ -1,12 +1,13 @@ -$NetBSD: patch-ac,v 1.7 1999/01/16 01:43:30 tron Exp $ +$NetBSD: patch-ac,v 1.8 1999/03/04 08:54:37 tron Exp $ ---- gtk/Makefile.in.orig Mon Jan 4 10:55:25 1999 -+++ gtk/Makefile.in Sat Jan 16 01:37:56 1999 -@@ -371,7 +371,6 @@ - - libgtk_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -- -release $(LT_RELEASE) \ - @GLIB_LIBS@ \ - @x_ldflags@ \ - @x_libs@ \ +--- gtk/Makefile.in.orig Thu Feb 25 21:15:36 1999 ++++ gtk/Makefile.in Wed Mar 3 23:37:29 1999 +@@ -152,7 +152,7 @@ + gdk_headers = ../gdk/gdktypes.h ../gdk/gdkrgb.h + + +-libgtk_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm ++libgtk_la_LDFLAGS = -release $(LT_RELEASE) @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm + + # $(top_builddir)/gdk/libgdk.la + diff --git a/x11/gtk/patches/patch-ad b/x11/gtk/patches/patch-ad new file mode 100644 index 00000000000..d5040b1dd2c --- /dev/null +++ b/x11/gtk/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5 1999/03/04 08:55:35 tron Exp $ + +--- po/Makefile.in.in.orig Thu Feb 25 12:02:20 1999 ++++ po/Makefile.in.in Thu Mar 4 00:14:56 1999 +@@ -19,7 +19,7 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + datadir = $(prefix)/@DATADIRNAME@ +-localedir = $(datadir)/locale ++localedir = $(prefix)/share/locale + gnulocaledir = $(prefix)/share/locale + gettextsrcdir = $(prefix)/share/gettext/po + subdir = po diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST index 5fc3e5adf6f..e312432695b 100644 --- a/x11/gtk/pkg/PLIST +++ b/x11/gtk/pkg/PLIST @@ -1,5 +1,8 @@ -@comment $NetBSD: PLIST,v 1.16 1999/01/16 01:43:30 tron Exp $ +@comment $NetBSD: PLIST,v 1.17 1999/03/04 08:54:38 tron Exp $ bin/gtk-config +etc/gtk/gtkrc.ja +etc/gtk/gtkrc.ko +etc/gtk/gtkrc.ru include/gdk/gdk.h include/gdk/gdkrgb.h include/gdk/gdkcursors.h @@ -120,10 +123,9 @@ include/gtk/gtklayout.h include/gtk/gtkplug.h include/gtk/gtksocket.h include/gtk/gtkthemes.h -include/gtk/gtkintl.h -lib/libgdk.so.11.1 +lib/libgdk-1.2.so.0.0 lib/libgdk.a -lib/libgtk.so.11.1 +lib/libgtk-1.2.so.0.0 lib/libgtk.a man/man1/gtk-config.1 @unexec install-info --delete %D/info/gdk.info %D/info/dir @@ -138,39 +140,26 @@ info/gtk.info-3 info/gtk.info-4 info/gtk.info-5 info/gtk.info-6 -lib/locale/ko/LC_MESSAGES/gtk+.mo -lib/locale/fr/LC_MESSAGES/gtk+.mo -lib/locale/de/LC_MESSAGES/gtk+.mo -lib/locale/no/LC_MESSAGES/gtk+.mo -lib/locale/sv/LC_MESSAGES/gtk+.mo -lib/locale/pt/LC_MESSAGES/gtk+.mo -lib/locale/ja/LC_MESSAGES/gtk+.mo -lib/locale/pl/LC_MESSAGES/gtk+.mo -lib/locale/nl/LC_MESSAGES/gtk+.mo share/aclocal/gtk.m4 +share/locale/ko/LC_MESSAGES/gtk+.mo +share/locale/fr/LC_MESSAGES/gtk+.mo +share/locale/de/LC_MESSAGES/gtk+.mo +share/locale/no/LC_MESSAGES/gtk+.mo +share/locale/sv/LC_MESSAGES/gtk+.mo +share/locale/pt/LC_MESSAGES/gtk+.mo +share/locale/ja/LC_MESSAGES/gtk+.mo +share/locale/pl/LC_MESSAGES/gtk+.mo +share/locale/nl/LC_MESSAGES/gtk+.mo +share/locale/cs/LC_MESSAGES/gtk+.mo +share/locale/es/LC_MESSAGES/gtk+.mo +share/locale/ru/LC_MESSAGES/gtk+.mo +share/locale/hu/LC_MESSAGES/gtk+.mo +share/locale/it/LC_MESSAGES/gtk+.mo share/themes/Default/gtk/gtkrc @unexec rmdir %D/share/aclocal 2>/dev/null || true -@dirrm include/gtk -@dirrm include/gdk -@dirrm lib/locale/de/LC_MESSAGES -@dirrm lib/locale/de -@dirrm lib/locale/fr/LC_MESSAGES -@dirrm lib/locale/fr -@dirrm lib/locale/nl/LC_MESSAGES -@dirrm lib/locale/nl -@dirrm lib/locale/pt/LC_MESSAGES -@dirrm lib/locale/pt -@dirrm lib/locale/ja/LC_MESSAGES -@dirrm lib/locale/ja -@dirrm lib/locale/sv/LC_MESSAGES -@dirrm lib/locale/sv -@dirrm lib/locale/pl/LC_MESSAGES -@dirrm lib/locale/pl -@dirrm lib/locale/no/LC_MESSAGES -@dirrm lib/locale/no -@dirrm lib/locale/ko/LC_MESSAGES -@dirrm lib/locale/ko -@dirrm lib/locale @dirrm share/themes/Default/gtk @dirrm share/themes/Default @dirrm share/themes +@dirrm include/gtk +@dirrm include/gdk +@dirrm etc/gtk |