From 68afba5cdf36d23664e61f2d1d4bff5e9aa621c4 Mon Sep 17 00:00:00 2001 From: sebastia <sebastia@openbsd.org> Date: Wed, 24 Nov 2010 07:10:44 +0000 Subject: [PATCH] Do the same thing for frameworks, as we do for libraries to set the .so.MAJOR.MINOR correctly, use the INSTANCE_VERSION variable instead of VERSION OK landry@ --- x11/gnustep/make/Makefile | 4 ++-- .../make/patches/patch-Instance_framework_make | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile index f3171be7daa..6aae8cd3457 100644 --- a/x11/gnustep/make/Makefile +++ b/x11/gnustep/make/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2010/11/22 08:36:59 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2010/11/24 07:10:44 sebastia Exp $ # WARNING: this port does NOT use the x11/gnustep MODULE @@ -7,7 +7,7 @@ PKG_ARCH= * COMMENT= GNUstep makefile package DISTNAME= gnustep-make-2.4.0 -REVISION= 3 +REVISION= 4 CATEGORIES= devel x11/gnustep HOMEPAGE= http://www.gnustep.org/ diff --git a/x11/gnustep/make/patches/patch-Instance_framework_make b/x11/gnustep/make/patches/patch-Instance_framework_make index 991754a15fd..63be2e3e659 100644 --- a/x11/gnustep/make/patches/patch-Instance_framework_make +++ b/x11/gnustep/make/patches/patch-Instance_framework_make @@ -1,6 +1,15 @@ -$OpenBSD: patch-Instance_framework_make,v 1.6 2010/06/07 06:28:13 ajacoutot Exp $ +$OpenBSD: patch-Instance_framework_make,v 1.7 2010/11/24 07:10:44 sebastia Exp $ --- Instance/framework.make.orig Mon Feb 15 00:13:47 2010 -+++ Instance/framework.make Mon Jun 7 08:15:35 2010 ++++ Instance/framework.make Thu Nov 18 11:11:02 2010 +@@ -252,7 +252,7 @@ FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$ + ifneq ($(BUILD_DLL), yes) + + FRAMEWORK_LIBRARY_FILE = lib$(GNUSTEP_INSTANCE)$(SHARED_LIBEXT) +-VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(VERSION) ++VERSION_FRAMEWORK_LIBRARY_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION) + SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION) + + else # BUILD_DLL @@ -557,13 +557,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/ ifeq ($(MAKE_CURRENT_VERSION),yes)