[Gsrc-commit] /srv/bzr/gsrc/trunk r1396: Create GNUstep-specific recipe

[Brandon Invergo]

------------------------------------------------------------
revno: 1396
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-11 09:44:23 +0100
message:
  Create GNUstep-specific recipe
added:
  gar.lib/gnustep.mk
modified:
  gnustep/gnustep-backend/Makefile
  gnustep/gnustep-base/Makefile
  gnustep/gnustep-corebase/Makefile
  gnustep/gnustep-gui/Makefile
  gnustep/performance/Makefile
  gnustep/renaissance/Makefile
  gnustep/sqlclient/Makefile
  util/new_project.sh
  util/templates/Makefile.m4

=== added file 'gar.lib/gnustep.mk'
--- a/gar.lib/gnustep.mk        1970-01-01 00:00:00 +0000
+++ b/gar.lib/gnustep.mk        2012-12-11 08:44:23 +0000
@@ -0,0 +1,15 @@
+# Rules for GSRC ports for GNUstep packages.
+#
+# Copyright (C) 2012 Free Software Foundation
+#
+# Redistribution and/or use, with or without modification, is
+# permitted.  This software is without warranty of any kind.  The
+# author(s) shall not be liable in the event that use of the
+# software causes damage.
+
+include ../../gar.lib/auto.mk
+
+GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
+CONFIGURE_ENV += $(GS_SETUP) &&
+BUILD_ENV += $(GS_SETUP) &&
+INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/gnustep-backend/Makefile'
--- a/gnustep/gnustep-backend/Makefile  2012-12-10 22:20:49 +0000
+++ b/gnustep/gnustep-backend/Makefile  2012-12-11 08:44:23 +0000
@@ -15,10 +15,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/gnustep-base/Makefile'
--- a/gnustep/gnustep-base/Makefile     2012-12-10 22:51:18 +0000
+++ b/gnustep/gnustep-base/Makefile     2012-12-11 08:44:23 +0000
@@ -18,7 +18,7 @@
 
 USE_AUTORECONF = y
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
 
 CONFIGURE_ARGS += 
--with-default-config=$(prefix)/GNUstep/Local/Configuration/GNUstep.conf \
@@ -26,7 +26,3 @@
                  --with-ffi-library=$(prefix)/lib \
                  --with-xml-prefix=$(prefix)
 
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/gnustep-corebase/Makefile'
--- a/gnustep/gnustep-corebase/Makefile 2012-12-10 22:36:12 +0000
+++ b/gnustep/gnustep-corebase/Makefile 2012-12-11 08:44:23 +0000
@@ -15,10 +15,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/gnustep-gui/Makefile'
--- a/gnustep/gnustep-gui/Makefile      2012-12-10 22:51:18 +0000
+++ b/gnustep/gnustep-gui/Makefile      2012-12-11 08:44:23 +0000
@@ -15,10 +15,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/performance/Makefile'
--- a/gnustep/performance/Makefile      2012-12-10 22:49:25 +0000
+++ b/gnustep/performance/Makefile      2012-12-11 08:44:23 +0000
@@ -17,10 +17,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/renaissance/Makefile'
--- a/gnustep/renaissance/Makefile      2012-12-10 22:41:54 +0000
+++ b/gnustep/renaissance/Makefile      2012-12-11 08:44:23 +0000
@@ -16,10 +16,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'gnustep/sqlclient/Makefile'
--- a/gnustep/sqlclient/Makefile        2012-12-10 22:50:03 +0000
+++ b/gnustep/sqlclient/Makefile        2012-12-11 08:44:23 +0000
@@ -15,10 +15,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include ../../gar.lib/gnustep.mk
 include config.mk
-
-GS_SETUP = . /$(prefix)/GNUstep/System/Library/Makefiles/GNUstep.sh
-CONFIGURE_ENV += $(GS_SETUP) &&
-BUILD_ENV += $(GS_SETUP) &&
-INSTALL_ENV += $(GS_SETUP) &&

=== modified file 'util/new_project.sh'
--- a/util/new_project.sh       2012-12-10 22:54:07 +0000
+++ b/util/new_project.sh       2012-12-11 08:44:23 +0000
@@ -7,22 +7,29 @@
     exit 1
 fi
 case $1 in
-    gnu) SITE="\$(MASTER_GNU)";;
-    gnome) SITE="\$(MASTER_GNOME)";;
-    gnustep) SITE="\$(MASTER_GNUSTEP)";;
-    alpha) SITE="\$(MASTER_GNU_ALPHA)";;
-    *) SITE="";;
-esac
-case $1 in
-    gnu) URL="http://www.gnu.org/software/${2}";;;
-    gnome) URL="http://www.gnome.org";;;
-    gnustep) URL="http://www.gnustep.org";;;
-    alpha) URL="http://www.gnu.org/software/${2}";;;
-    *) URL="";;
-esac
+    gnu) SITE="\$(MASTER_GNU)"
+        URL="http://www.gnu.org/software/${2}";
+        RECIPE="../../gar.lib/auto.mk"
+        ;;
+    gnome) SITE="\$(MASTER_GNOME)"
+          URL="http://www.gnome.org";
+          RECIPE="../../gar.lib/auto.mk"
+          ;;
+    gnustep) SITE="\$(MASTER_GNUSTEP)"
+             URL="http://www.gnustep.org";
+            RECIPE="../../gar.lib/gnustep.mk"
+            ;;
+    alpha) SITE="\$(MASTER_GNU_ALPHA)"
+          URL="http://www.gnu.org/software/${2}";
+          RECIPE="../../gar.lib/auto.mk"
+          ;;
+    *) SITE=""
+       URL=""
+       RECIPE="../../gar.lib/auto.mk"
+       ;;
 
 mkdir -p ../${1}/${2}
 m4 -D__NAME=${2} -D__VERSION=${3} -D__URL=${URL} -D__SITE=${SITE} \
-    templates/Makefile.m4 > ../${1}/${2}/Makefile
+    -D__RECIPE=${RECIPE} templates/Makefile.m4 > ../${1}/${2}/Makefile
 m4 -D__NAME=${2} templates/config.mk.m4 > ../${1}/${2}/config.mk
 exit 0

=== modified file 'util/templates/Makefile.m4'
--- a/util/templates/Makefile.m4        2012-12-10 22:54:07 +0000
+++ b/util/templates/Makefile.m4        2012-12-11 08:44:23 +0000
@@ -15,5 +15,5 @@
 
 ######################################################################
 
-include ../../gar.lib/auto.mk
+include __RECIPE
 include config.mk