From aa8b4f6b0bcdca01a66b6c8b9910a52b9a0c63d5 Mon Sep 17 00:00:00 2001 From: alek Date: Wed, 11 May 2005 19:18:42 +0000 Subject: [PATCH] - Bump lib major after recent libc changes - Bump PKGNAME - Regen PLIST go ahead espie@ --- x11/gtk+/Makefile | 4 ++-- x11/gtk+/patches/patch-gdk_Makefile_in | 8 ++++---- x11/gtk+/patches/patch-gtk_Makefile_in | 14 +++++++------- x11/gtk+/pkg/PFRAG.shared | 6 +++--- x11/gtk+/pkg/PLIST | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/x11/gtk+/Makefile b/x11/gtk+/Makefile index dd4003a1ef7..a974cf789f7 100644 --- a/x11/gtk+/Makefile +++ b/x11/gtk+/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.58 2005/04/25 16:29:19 espie Exp $ +# $OpenBSD: Makefile,v 1.59 2005/05/11 19:18:42 alek Exp $ COMMENT= "General Toolkit for X11 GUI" DISTNAME= gtk+-1.2.10 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME}p3 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/1.2/} diff --git a/x11/gtk+/patches/patch-gdk_Makefile_in b/x11/gtk+/patches/patch-gdk_Makefile_in index ff4e15f95b1..62dcc3fd08a 100644 --- a/x11/gtk+/patches/patch-gdk_Makefile_in +++ b/x11/gtk+/patches/patch-gdk_Makefile_in @@ -1,11 +1,11 @@ ---- gdk/Makefile.in.orig Wed Mar 7 09:57:35 2001 -+++ gdk/Makefile.in Wed Mar 7 09:59:58 2001 -@@ -135,7 +135,7 @@ +--- gdk/Makefile.in.orig Mon Apr 2 05:14:11 2001 ++++ gdk/Makefile.in Thu May 5 00:30:41 2005 +@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libgdk.la # libtool stuff: set version and export symbols for resolving libgdkincludedir = $(includedir)/gtk-1.2/gdk -libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ -+libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 1:2:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ ++libgdk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 2:0:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ # diff --git a/x11/gtk+/patches/patch-gtk_Makefile_in b/x11/gtk+/patches/patch-gtk_Makefile_in index 27627681d70..5dbf783fbeb 100644 --- a/x11/gtk+/patches/patch-gtk_Makefile_in +++ b/x11/gtk+/patches/patch-gtk_Makefile_in @@ -1,6 +1,6 @@ ---- gtk/Makefile.in.orig Wed Mar 7 10:02:47 2001 -+++ gtk/Makefile.in Wed Mar 7 10:05:22 2001 -@@ -125,7 +125,7 @@ +--- gtk/Makefile.in.orig Mon Apr 2 05:14:13 2001 ++++ gtk/Makefile.in Thu May 5 00:30:30 2005 +@@ -125,7 +125,7 @@ x_ldflags = @x_ldflags@ x_libs = @x_libs@ xinput_progs = @xinput_progs@ @@ -9,16 +9,16 @@ # -@@ -135,7 +135,7 @@ +@@ -135,7 +135,7 @@ lib_LTLIBRARIES = libgtk.la # libtool stuff: set version and export symbols for resolving libgtkincludedir = $(includedir)/gtk-1.2/gtk -libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ -+libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 1:2:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ ++libgtk_la_LDFLAGS = @STRIP_BEGIN@ -version-info 2:0:0 -export-dynamic @GLIB_DEPLIBS@ @x_ldflags@ @x_libs@ -lm @STRIP_END@ # $(top_builddir)/gdk/libgdk.la -@@ -190,7 +190,7 @@ +@@ -190,7 +190,7 @@ EXTRA_DIST = $(gtk_private_h_sources) $ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc CLEANFILES = $(gen_sources) @@ -27,7 +27,7 @@ gtkconf_DATA = gtkrc.az 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.cp1251 gtkrc.cp1255 -@@ -1362,7 +1362,7 @@ +@@ -1362,7 +1362,7 @@ install: install-am uninstall-am: uninstall-libLTLIBRARIES uninstall-gtkconfDATA \ uninstall-libgtkincludeHEADERS uninstall-local uninstall: uninstall-am diff --git a/x11/gtk+/pkg/PFRAG.shared b/x11/gtk+/pkg/PFRAG.shared index 11c457ef482..3b6f41cf158 100644 --- a/x11/gtk+/pkg/PFRAG.shared +++ b/x11/gtk+/pkg/PFRAG.shared @@ -1,3 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/08 16:15:17 espie Exp $ -@lib lib/libgdk.so.1.2 -@lib lib/libgtk.so.1.2 +@comment $OpenBSD: PFRAG.shared,v 1.4 2005/05/11 19:18:43 alek Exp $ +@lib lib/libgdk.so.2.0 +@lib lib/libgtk.so.2.0 diff --git a/x11/gtk+/pkg/PLIST b/x11/gtk+/pkg/PLIST index 587b0d748e1..24e78dad70a 100644 --- a/x11/gtk+/pkg/PLIST +++ b/x11/gtk+/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.31 2005/04/25 16:29:19 espie Exp $ +@comment $OpenBSD: PLIST,v 1.32 2005/05/11 19:18:43 alek Exp $ %%SHARED%% bin/gtk-config include/gtk-1.2/ @@ -124,6 +124,8 @@ include/gtk-1.2/gtk/gtkvscrollbar.h include/gtk-1.2/gtk/gtkvseparator.h include/gtk-1.2/gtk/gtkwidget.h include/gtk-1.2/gtk/gtkwindow.h +@info info/gdk.info +@info info/gtk.info lib/libgdk.a lib/libgdk.la lib/libgtk.a @@ -131,10 +133,8 @@ lib/libgtk.la lib/pkgconfig/ lib/pkgconfig/gdk.pc lib/pkgconfig/gtk+.pc -share/aclocal/gtk.m4 -@info info/gdk.info -@info info/gtk.info @man man/man1/gtk-config.1 +share/aclocal/gtk.m4 share/locale/az/ share/locale/az/LC_MESSAGES/ share/locale/az/LC_MESSAGES/gtk+.mo