SF.net SVN: gar:[24373] csw/mgar/pkg/gnustep-base/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 24373
          http://sourceforge.net/p/gar/code/24373
Author:   dmichelsen
Date:     2014-11-24 20:14:12 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
gnustep-base/trunk: Some fixes

Modified Paths:
--------------
    csw/mgar/pkg/gnustep-base/trunk/Makefile

Modified: csw/mgar/pkg/gnustep-base/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnustep-base/trunk/Makefile	2014-11-24 20:13:41 UTC (rev 24372)
+++ csw/mgar/pkg/gnustep-base/trunk/Makefile	2014-11-24 20:14:12 UTC (rev 24373)
@@ -10,31 +10,36 @@
   GNUstep-core base framework, which provides all Foundation equivalent classes, useful for all non-gui objective-c development. A prerequisite for all GNUstep tools as well as applications.
 endef
 
-BUILD_DEP_PKGS_CSWgnustep-base = CSWgmake CSWgcc4objc CSWgnustep-make
-RUNTIME_DEP_PKGS_CSWgnustep-base = CSWgnustep-make
+MASTER_SITES += ftp://ftp.gnustep.org/pub/gnustep/core/
+DISTFILES += $(DISTNAME).tar.gz
 
-BUILD_DEP_PKGS_CSWgnustep-base += CSWlibffi-dev
-RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibffi5 
+BUILD_DEP_PKGS += CSWgmake
+BUILD_DEP_PKGS += CSWgcc4objc
+BUILD_DEP_PKGS += CSWgnustep-make
+BUILD_DEP_PKGS += CSWlibffi-dev
+BUILD_DEP_PKGS += CSWlibicu-dev
+BUILD_DEP_PKGS += CSWlibgnutls-dev
+BUILD_DEP_PKGS += CSWlibxml2-dev CSWlibxslt-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
 
-BUILD_DEP_PKGS_CSWgnustep-base += CSWlibicu-dev
-RUNTIME_DEP_PGKS_CSWgnustep-base += CSWlibicui18n52 CSWlibicuuc52 CSWlibicudata52
-
-RUNTIME_DEP_PGKS_CSWgnustep-base += CSWlibobjc4 CSWlibgcc-s1 CSWlibgmp10
-
-BUILD_DEP_PKGS_CSWgnustep-base += CSWlibgnutls-dev
-RUNTIME_DEP_PGKS_CSWgnustep-base += CSWlibssl1-0-0 CSWlibgnutls28 CSWlibgcrypt20
-
-BUILD_DEP_PKGS_CSWgnustep-base += CSWlibxml2-dev CSWlibxslt-dev
-RUNTIME_DEP_PGKS_CSWgnustep-base += CSWlibxslt1 CSWlibxml2-2
-BUILD_DEP_PKGS_CSWgnustep-base += CSWlibiconv-dev
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWgnustep-make
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxslt1
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicuuc52
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibgmp10
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibobjc4
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicudata52
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibffi5
+RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibicui18n52
 RUNTIME_DEP_PKGS_CSWgnustep-base += CSWlibiconv2
 
+#overrides
+CHECKPKG_OVERRIDES_CSWgnustep-base += surplus-dependency|CSWgnustep-make
+CHECKPKG_OVERRIDES_CSWgnustep-base += file-with-bad-content|/usr/local|root/opt/csw/GNUstep/System/Library/Libraries/gnustep-base/Versions/1.24/Resources/NSTimeZones/README
 
-MASTER_SITES = ftp://ftp.gnustep.org/pub/gnustep/core/
-DISTFILES  = $(DISTNAME).tar.gz
-
-
-
 #where can we build?
 PACKAGING_PLATFORMS += solaris9-sparc
 PACKAGING_PLATFORMS += solaris10-sparc
@@ -47,7 +52,7 @@
 EXTRA_RUNPATH_DIRS = /opt/csw/GNUstep/System/Library/Libraries
 
 #we disable linker maps (needed for gnutls)
-LINKER_MAPS =
+# LINKER_MAPS =
 
 # now special targets for configure, build and install so that we can source
 # GNUstep.sh before
@@ -64,20 +69,14 @@
 include gar/category.mk
 
 configure-sourcegs:
-	. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) ; $(CONFIGURE_ENV) ./configure $(CONFIGURE_ARGS)
+	$(CONFIGURE_ENV) && . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && ./configure $(CONFIGURE_ARGS)
 	@$(MAKECOOKIE)
 
 build-sourcegs:
-	. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(BUILD_ENV) ; $(MAKE)
+	$(BUILD_ENV) && . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && $(MAKE)
 	@$(MAKECOOKIE)
 
 install-sourcegs:
-	. $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && /usr/bin/env -i $(INSTALL_ENV) ; $(MAKE) install DESTDIR=$(DESTDIR)
+	$(INSTALL_ENV) && . $(BUILD_PREFIX)/GNUstep/System/Library/Makefiles/GNUstep.sh && cd $(WORKSRC) && $(MAKE) install DESTDIR=$(DESTDIR)
 	@$(MAKECOOKIE)
 
-test-none :
-	@$(MAKECOOKIE)
-
-#overrides
-CHECKPKG_OVERRIDES_CSWgnustep-base += surplus-dependency|CSWgnustep-make
-CHECKPKG_OVERRIDES_CSWgnustep-base += file-with-bad-content|/usr/local|root/opt/csw/GNUstep/System/Library/Libraries/gnustep-base/Versions/1.24/Resources/NSTimeZones/README

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.