diff options
| author | manu <manu@pkgsrc.org> | 2015-04-19 04:13:26 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2015-04-19 04:13:26 +0000 |
| commit | 1d422ceae5f646b1a271f8f6123212ec0f121ca7 (patch) | |
| tree | 711efb4e0ab71eaeac7b07439e81a5564c128612 /devel/gnustep-make | |
| parent | f6ca6674351ab5786efbdb108d14ed8f8c85a4b5 (diff) | |
| download | pkgsrc-1d422ceae5f646b1a271f8f6123212ec0f121ca7.tar.gz | |
Apply fix from upstream, to workaround a build failure in SOGo
http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185
Diffstat (limited to 'devel/gnustep-make')
| -rw-r--r-- | devel/gnustep-make/Makefile | 4 | ||||
| -rw-r--r-- | devel/gnustep-make/distinfo | 4 | ||||
| -rw-r--r-- | devel/gnustep-make/patches/patch-Instance_framework.make | 25 |
3 files changed, 28 insertions, 5 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile index 08428d09aec..f4dd70c1972 100644 --- a/devel/gnustep-make/Makefile +++ b/devel/gnustep-make/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2014/10/09 14:06:09 wiz Exp $ +# $NetBSD: Makefile,v 1.57 2015/04/19 04:13:26 manu Exp $ DISTNAME= gnustep-make-2.6.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= devel gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo index c93b73c9321..35a21728cb5 100644 --- a/devel/gnustep-make/distinfo +++ b/devel/gnustep-make/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.27 2013/03/24 17:02:37 joerg Exp $ +$NetBSD: distinfo,v 1.28 2015/04/19 04:13:26 manu Exp $ SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042 Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes -SHA1 (patch-Instance_framework.make) = e15b2e120bacb632973b6b6e1ece4df8712ebd37 +SHA1 (patch-Instance_framework.make) = ff6f0259e38f99ce2dd88f9ffc00299da9d1eb86 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661 diff --git a/devel/gnustep-make/patches/patch-Instance_framework.make b/devel/gnustep-make/patches/patch-Instance_framework.make index c1b4f563c9d..927df7fcf80 100644 --- a/devel/gnustep-make/patches/patch-Instance_framework.make +++ b/devel/gnustep-make/patches/patch-Instance_framework.make @@ -1,4 +1,9 @@ -$NetBSD: patch-Instance_framework.make,v 1.1 2013/03/24 17:02:37 joerg Exp $ +$NetBSD: patch-Instance_framework.make,v 1.2 2015/04/19 04:13:26 manu Exp $ + +Hunk #1: Don't create interfaces don't derive from NSObject + +Hunk #2 and #3: Apply fix from upstream, required to build SOGo +http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185 --- Instance/framework.make.orig 2013-03-23 21:46:20.000000000 +0000 +++ Instance/framework.make @@ -11,3 +16,21 @@ $NetBSD: patch-Instance_framework.make,v 1.1 2013/03/24 17:02:37 joerg Exp $ echo "+ (NSString *)frameworkEnv;" >> $@; \ echo "+ (NSString *)frameworkPath;" >> $@; \ echo "+ (NSString *)frameworkVersion;" >> $@; \ +@@ -536,7 +536,7 @@ + $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR): + $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) + +-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/ ++$(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) + $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework; \ + $(RM_LN_S) $(GNUSTEP_INSTANCE); \ +@@ -562,7 +562,7 @@ + $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR): + $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO) + +-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/ ++$(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) + $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \ + $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \ |