Sun Apr 19 04:13:26 2015 UTC ()
Apply fix from upstream, to workaround a build failure in SOGo
http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185


(manu)
diff -r1.56 -r1.57 pkgsrc/devel/gnustep-make/Makefile
diff -r1.27 -r1.28 pkgsrc/devel/gnustep-make/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/gnustep-make/patches/patch-Instance_framework.make
cvs diff -r1.56 -r1.57 pkgsrc/devel/gnustep-make/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/Makefile 2014/10/09 14:06:09 1.56
+++ pkgsrc/devel/gnustep-make/Makefile 2015/04/19 04:13:26 1.57
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.56 2014/10/09 14:06:09 wiz Exp $ 1# $NetBSD: Makefile,v 1.57 2015/04/19 04:13:26 manu Exp $
2 2
3DISTNAME= gnustep-make-2.6.2 3DISTNAME= gnustep-make-2.6.2
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= devel gnustep 5CATEGORIES= devel gnustep
6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/} 6MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnustep.org/ 9HOMEPAGE= http://www.gnustep.org/
10COMMENT= GNUstep makefile package 10COMMENT= GNUstep makefile package
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13USE_LANGUAGES+= c99 objc c++ obj-c++ 13USE_LANGUAGES+= c99 objc c++ obj-c++
14USE_TOOLS+= csh 14USE_TOOLS+= csh
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q} 16CONFIGURE_ENV+= INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
17CONFIGURE_ARGS+= --disable-importing-config-file 17CONFIGURE_ARGS+= --disable-importing-config-file
cvs diff -r1.27 -r1.28 pkgsrc/devel/gnustep-make/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/distinfo 2013/03/24 17:02:37 1.27
+++ pkgsrc/devel/gnustep-make/distinfo 2015/04/19 04:13:26 1.28
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.27 2013/03/24 17:02:37 joerg Exp $ 1$NetBSD: distinfo,v 1.28 2015/04/19 04:13:26 manu Exp $
2 2
3SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff 3SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff
4RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042 4RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042
5Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes 5Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes
6SHA1 (patch-Instance_framework.make) = e15b2e120bacb632973b6b6e1ece4df8712ebd37 6SHA1 (patch-Instance_framework.make) = ff6f0259e38f99ce2dd88f9ffc00299da9d1eb86
7SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b 7SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
8SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d 8SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
9SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661 9SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661
10SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8 10SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8
cvs diff -r1.1 -r1.2 pkgsrc/devel/gnustep-make/patches/Attic/patch-Instance_framework.make (expand / switch to unified diff)

--- pkgsrc/devel/gnustep-make/patches/Attic/patch-Instance_framework.make 2013/03/24 17:02:37 1.1
+++ pkgsrc/devel/gnustep-make/patches/Attic/patch-Instance_framework.make 2015/04/19 04:13:26 1.2
@@ -1,13 +1,36 @@ @@ -1,13 +1,36 @@
1$NetBSD: patch-Instance_framework.make,v 1.1 2013/03/24 17:02:37 joerg Exp $ 1$NetBSD: patch-Instance_framework.make,v 1.2 2015/04/19 04:13:26 manu Exp $
 2
 3Hunk #1: Don't create interfaces don't derive from NSObject
 4
 5Hunk #2 and #3: Apply fix from upstream, required to build SOGo
 6http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185
2 7
3--- Instance/framework.make.orig 2013-03-23 21:46:20.000000000 +0000 8--- Instance/framework.make.orig 2013-03-23 21:46:20.000000000 +0000
4+++ Instance/framework.make 9+++ Instance/framework.make
5@@ -484,7 +484,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURC 10@@ -484,7 +484,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURC
6 fi; \ 11 fi; \
7 echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \ 12 echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \
8 echo "#include <Foundation/NSString.h>" > $@; \ 13 echo "#include <Foundation/NSString.h>" > $@; \
9- echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \ 14- echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
10+ echo "@interface $(DUMMY_FRAMEWORK) : NSObject" >> $@; \ 15+ echo "@interface $(DUMMY_FRAMEWORK) : NSObject" >> $@; \
11 echo "+ (NSString *)frameworkEnv;" >> $@; \ 16 echo "+ (NSString *)frameworkEnv;" >> $@; \
12 echo "+ (NSString *)frameworkPath;" >> $@; \ 17 echo "+ (NSString *)frameworkPath;" >> $@; \
13 echo "+ (NSString *)frameworkVersion;" >> $@; \ 18 echo "+ (NSString *)frameworkVersion;" >> $@; \
 19@@ -536,7 +536,7 @@
 20 $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
 21 $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
 22
 23-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
 24+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
 25 ifeq ($(MAKE_CURRENT_VERSION),yes)
 26 $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework; \
 27 $(RM_LN_S) $(GNUSTEP_INSTANCE); \
 28@@ -562,7 +562,7 @@
 29 $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
 30 $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
 31
 32-$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
 33+$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)
 34 ifeq ($(MAKE_CURRENT_VERSION),yes)
 35 $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \
 36 $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \