7114886 Remove SOURCE_UNCOMPRESS support from X makefiles s11u1_05
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 29 Nov 2011 18:56:12 -0800
changeset 1228 47726356aac9
parent 1227 4282a59bc443
child 1229 157ff567729e
7114886 Remove SOURCE_UNCOMPRESS support from X makefiles
open-src/app/synergy/Makefile
open-src/app/xterm/Makefile
open-src/common/Makefile.inc
open-src/font/google-droid/Makefile
open-src/font/liberation/Makefile
open-src/lib/fontconfig/Makefile
open-src/lib/freeglut/Makefile
open-src/xserver/xvnc/Makefile
--- a/open-src/app/synergy/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/app/synergy/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -59,8 +59,6 @@
 # Source tarball
 SOURCE_TARBALL_NAME=synergy-plus-$(MODULE_VERSION).tar.gz
 SOURCE_TARBALL_NAME_SET=yes
-SOURCE_UNCOMPRESS=gzcat
-SOURCE_UNCOMPRESS_SET=yes
 SOURCE_DIRNAME=synergy-plus-$(MODULE_VERSION)
 SOURCE_DIRNAME_SET=yes
 
--- a/open-src/app/xterm/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/app/xterm/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -59,7 +59,6 @@
 # Source tarball
 SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERSION).tar.gz
 SOURCE_TARBALL_NAME_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = resize.man.patch,-p1 desktop-icon.patch,-p1
--- a/open-src/common/Makefile.inc	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/common/Makefile.inc	Tue Nov 29 18:56:12 2011 -0800
@@ -377,13 +377,14 @@
 	else \
 	  if [[ "$(MODULE_VERSION)" = "git" ]] ; then \
 	    SOURCE_CMD='gtar --exclude=.git* -cf - $(GIT_CLONE_DIR)' ; \
+	    SOURCE_FILE='-' ; \
 	  else \
-	    UNCOMP_CMD="$(SOURCE_UNCOMPRESS)" ; \
-	    SOURCE_CMD="$${UNCOMP_CMD:-bzcat} $(SOURCE_TARBALL)" ; \
+	    SOURCE_CMD=':' ; SOURCE_FILE='$(SOURCE_TARBALL)' ; \
 	  fi ; \
 	  $(START_CMD_ECHO) ; \
 	  $${SOURCE_CMD} | \
-		gtar --directory="$(BUILD_DIR)" $(ADD_TAR_FLAGS) -xf -  ; \
+	    gtar --directory="$(BUILD_DIR)" $(ADD_TAR_FLAGS) \
+		 -xf $${SOURCE_FILE} ; \
 	fi
 	touch $(SOURCE_INIT_TARGET)
 
--- a/open-src/font/google-droid/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/font/google-droid/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -59,7 +59,6 @@
 # http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=54e235b011be9e1e38a2b9be787d0a196493d89e;sf=tgz
 SOURCE_URL=http://dlc.sun.com/osol/x/downloads/mirrors/$(SOURCE_TARBALL_NAME)
 SOURCE_URL_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=		# None
--- a/open-src/font/liberation/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/font/liberation/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -51,7 +51,6 @@
 # Download site for source
 SOURCE_URL=http://fedorahosted.org/releases/l/i/liberation-fonts/$(SOURCE_TARBALL_NAME)
 SOURCE_URL_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=		# None
--- a/open-src/lib/fontconfig/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/lib/fontconfig/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -63,7 +63,6 @@
 # Source tarball
 SOURCE_TARBALL_NAME=fontconfig-$(MODULE_VERSION).tar.gz
 SOURCE_TARBALL_NAME_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Download site for source
 SOURCE_URL=http://fontconfig.org/release/$(SOURCE_TARBALL_NAME)
--- a/open-src/lib/freeglut/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/lib/freeglut/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -52,7 +52,6 @@
 # Source tarball
 SOURCE_TARBALL_NAME = freeglut-$(MODULE_VERSION).tar.gz
 SOURCE_TARBALL_NAME_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Library name (used for specfiles/mapfiles)
 LIBNAME=glut
--- a/open-src/xserver/xvnc/Makefile	Mon Nov 21 11:44:29 2011 -0800
+++ b/open-src/xserver/xvnc/Makefile	Tue Nov 29 18:56:12 2011 -0800
@@ -60,7 +60,6 @@
 # Download site for source
 SOURCE_URL=$(SF_DOWNLOADS_URL)/tigervnc/tigervnc/1.0.90%20%281.1beta1%29/$(SOURCE_TARBALL_NAME)
 SOURCE_URL_SET=yes
-SOURCE_UNCOMPRESS=gzcat
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
@@ -153,7 +152,6 @@
 		BUILD_TYPE="$(BUILD_TYPE)" \
 		SOURCE_TARBALL="$(XORG_TARBALL)" \
 		SOURCE_DEPS="$(XORG_TARBALL)" \
-		SOURCE_UNCOMPRESS="bzcat" \
 		SOURCE_DIR="$(XORG_BUILD_DIR)" \
 		BUILD_DIR="$(XORG_BUILD_DIR)" \
 		ADD_TAR_FLAGS="--strip-components=1"