From bc68c3c80beedda3c181983f499fa9378b7739ae Mon Sep 17 00:00:00 2001 From: pvalchev Date: Sat, 21 Jul 2001 00:27:10 +0000 Subject: [PATCH] We don't want the program version number in the shared library names, so don't pass -release to libtool. --- x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_am | 12 ++++++++++++ x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in | 12 ++++++++++++ x11/gtkmm/patches/patch-src_gtk--_Makefile_am | 12 ++++++++++++ x11/gtkmm/patches/patch-src_gtk--_Makefile_in | 12 ++++++++++++ x11/gtkmm/pkg/PFRAG.shared | 6 ++---- 5 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_am create mode 100644 x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in create mode 100644 x11/gtkmm/patches/patch-src_gtk--_Makefile_am create mode 100644 x11/gtkmm/patches/patch-src_gtk--_Makefile_in diff --git a/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_am b/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_am new file mode 100644 index 00000000000..9b585f32141 --- /dev/null +++ b/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-gdk--_gdk--_Makefile_am,v 1.1 2001/07/21 00:27:10 pvalchev Exp $ +--- gdk--/gdk--/Makefile.am.orig Fri Jan 14 12:27:27 2000 ++++ gdk--/gdk--/Makefile.am Fri Jul 20 16:31:18 2001 +@@ -8,7 +8,7 @@ libgdkmm_la_SOURCES = \ + bitmap.cc colormap.cc font.cc main.cc window.cc \ + color.cc drawable.cc gc.cc pixmap.cc visual.cc \ + image.cc types.cc cursor.cc +-libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE) ++libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) + + libgdkmmincludedir = $(includedir)/gdk-- + libgdkmminclude_HEADERS = \ diff --git a/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in b/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in new file mode 100644 index 00000000000..b770c13fddb --- /dev/null +++ b/x11/gtkmm/patches/patch-gdk--_gdk--_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-gdk--_gdk--_Makefile_in,v 1.1 2001/07/21 00:27:10 pvalchev Exp $ +--- gdk--/gdk--/Makefile.in.orig Sat May 20 12:51:19 2000 ++++ gdk--/gdk--/Makefile.in Fri Jul 20 16:31:10 2001 +@@ -100,7 +100,7 @@ lib_LTLIBRARIES = libgdkmm.la + + libgdkmm_la_SOURCES = bitmap.cc colormap.cc font.cc main.cc window.cc color.cc drawable.cc gc.cc pixmap.cc visual.cc image.cc types.cc cursor.cc + +-libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE) ++libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) + + libgdkmmincludedir = $(includedir)/gdk-- + libgdkmminclude_HEADERS = bitmap.h colormap.h gc.h main.h color.h drawable.h pixmap.h font.h types.h window.h visual.h image.h list.h cursor.h diff --git a/x11/gtkmm/patches/patch-src_gtk--_Makefile_am b/x11/gtkmm/patches/patch-src_gtk--_Makefile_am new file mode 100644 index 00000000000..95bf67ca9a4 --- /dev/null +++ b/x11/gtkmm/patches/patch-src_gtk--_Makefile_am @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gtk--_Makefile_am,v 1.1 2001/07/21 00:27:10 pvalchev Exp $ +--- src/gtk--/Makefile.am.orig Sun May 14 14:10:08 2000 ++++ src/gtk--/Makefile.am Fri Jul 20 16:30:30 2001 +@@ -47,7 +47,7 @@ include_HEADERS = $(gtkmmh) marshal.h pr + + # This builds the library + libgtkmm_la_SOURCES = $(gtkmmc) gtk--.cc proxy.cc base.cc marshal.cc +-libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -release $(GTKMM_RELEASE) -no-undefined ++libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -no-undefined + libgtkmm_la_INCLUDES = $(GTK_CFLAGS) + libgtkmm_la_LIBADD = $(GTK_LIBS) $(gtkmmla) + #libgtkmm_la_DEPENDENCIES = $(gtkmmla) diff --git a/x11/gtkmm/patches/patch-src_gtk--_Makefile_in b/x11/gtkmm/patches/patch-src_gtk--_Makefile_in new file mode 100644 index 00000000000..46410a1e488 --- /dev/null +++ b/x11/gtkmm/patches/patch-src_gtk--_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-src_gtk--_Makefile_in,v 1.1 2001/07/21 00:27:10 pvalchev Exp $ +--- src/gtk--/Makefile.in.orig Sat May 20 12:51:35 2000 ++++ src/gtk--/Makefile.in Fri Jul 20 16:30:22 2001 +@@ -133,7 +133,7 @@ include_HEADERS = $(gtkmmh) marshal.h pr + + # This builds the library + libgtkmm_la_SOURCES = $(gtkmmc) gtk--.cc proxy.cc base.cc marshal.cc +-libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -release $(GTKMM_RELEASE) -no-undefined ++libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -no-undefined + libgtkmm_la_INCLUDES = $(GTK_CFLAGS) + libgtkmm_la_LIBADD = $(GTK_LIBS) $(gtkmmla) + #libgtkmm_la_DEPENDENCIES = $(gtkmmla) diff --git a/x11/gtkmm/pkg/PFRAG.shared b/x11/gtkmm/pkg/PFRAG.shared index 48d4249d849..57d67afa2d5 100644 --- a/x11/gtkmm/pkg/PFRAG.shared +++ b/x11/gtkmm/pkg/PFRAG.shared @@ -1,6 +1,4 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2000/07/04 02:17:54 krw Exp $ -lib/libgdkmm-1.2.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2001/07/21 00:27:10 pvalchev Exp $ lib/libgdkmm.so.1.0 -lib/libgtkmm-1.2.so.0.1 lib/libgtkmm.so.0.1 -DYNLIBDIR(%D/lib) +DYNLIBDIR(%B)