[csw-devel] SF.net SVN: gar:[6738] csw/mgar/pkg/autoproject/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Wed Oct 7 12:03:07 CEST 2009
Revision: 6738
http://gar.svn.sourceforge.net/gar/?rev=6738&view=rev
Author: wahwah
Date: 2009-10-07 10:03:07 +0000 (Wed, 07 Oct 2009)
Log Message:
-----------
autoproject: Added a patch to make it work on Solaris
Modified Paths:
--------------
csw/mgar/pkg/autoproject/trunk/Makefile
csw/mgar/pkg/autoproject/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch
Modified: csw/mgar/pkg/autoproject/trunk/Makefile
===================================================================
--- csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 02:58:35 UTC (rev 6737)
+++ csw/mgar/pkg/autoproject/trunk/Makefile 2009-10-07 10:03:07 UTC (rev 6738)
@@ -22,9 +22,14 @@
SPKG_SOURCEURL = http://packages.debian.org/unstable/devel/autoproject
MASTER_SITES = http://ftp.de.debian.org/debian/pool/main/a/$(GARNAME)/
DISTFILES = $(GARNAME)_$(GARVERSION).orig.tar.gz
+PATCHFILES = 0001-gawk-and-ggrep.patch
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
ARCHALL = 1
-REQUIRED_PKGS = CSWautomake
+REQUIRED_PKGS = CSWautomake CSWbash CSWgawk CSWggrep
TEST_SCRIPTS =
CONFIGURE_ARGS = $(DIRPATHS)
+AWK=gawk
+export AWK
+GREP=ggrep
+export GREP
include gar/category.mk
Modified: csw/mgar/pkg/autoproject/trunk/checksums
===================================================================
--- csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 02:58:35 UTC (rev 6737)
+++ csw/mgar/pkg/autoproject/trunk/checksums 2009-10-07 10:03:07 UTC (rev 6738)
@@ -1,2 +1,2 @@
-c56275967bba34ce1864b3d917e08e55 download/autoproject_0.20-5.diff.gz
+acbc54ffab66fd0e7e1820f280a454f1 download/0001-gawk-and-ggrep.patch
609369fa76391d58714059313b9c831c download/autoproject_0.20.orig.tar.gz
Added: csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch
===================================================================
--- csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch (rev 0)
+++ csw/mgar/pkg/autoproject/trunk/files/0001-gawk-and-ggrep.patch 2009-10-07 10:03:07 UTC (rev 6738)
@@ -0,0 +1,123 @@
+From e740fa7364ce0c3a4e67474df83533aae4e85595 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Maciej=20Blizi=C5=84ski?= <blizinski at google.com>
+Date: Wed, 7 Oct 2009 10:56:16 +0100
+Subject: [PATCH] gawk and ggrep
+
+---
+ autoproject.in | 25 +++++++++++++------------
+ 1 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/autoproject.in b/autoproject.in
+index d7d1ce8..faa67cc 100755
+--- a/autoproject.in
++++ b/autoproject.in
+@@ -12,7 +12,8 @@ set -e
+
+ prefix=@prefix@
+ DATADIR=@datadir@
+-AWK=awk
++AWK=gawk
++GREP=ggrep
+ NAME=
+ EMAIL=
+ theoptions=a:d:e:i:l:n:o:p:vVh
+@@ -67,7 +68,7 @@ while
+ DESCRIPTION="$OPTARG"; shift $two ;;
+ e|-e|--email) EMAIL="$OPTARG"; shift $two ;;
+ i|-i|--interface)
+- if echo "$STDIFS"|grep -q -- " $OPTARG "; then
++ if echo "$STDIFS"|${GREP} -q -- " $OPTARG "; then
+ IFACE="$OPTARG"; shift $two;
+ else
+ echo "unrecognized interface $OPTARG";
+@@ -78,13 +79,13 @@ while
+ if [ "$OPTARG" = "" ]; then
+ SKELETONS="";
+ else
+- if (echo $OPTARG|grep ^/ >/dev/null); then true; \
++ if (echo $OPTARG|${GREP} ^/ >/dev/null); then true; \
+ else OPTARG=`pwd`/$OPTARG; fi
+ SKELETONS="$OPTARG $SKELETONS";
+ fi;
+ shift $two;;
+ l|-l|--language)
+- if echo "$STDLANGS"|grep -F -q -- " $OPTARG "; then
++ if echo "$STDLANGS"|${GREP} -F -q -- " $OPTARG "; then
+ PROJECT_LANG="$PROJECT_LANG $OPTARG "; shift $two;
+ else
+ echo "unrecognized language $OPTARG";
+@@ -94,7 +95,7 @@ while
+ n|-n|--name)
+ NAME=$OPTARG; shift $two ;;
+ o|-o|--option)
+- if echo "$STDOPTS"|grep -q -- " $OPTARG "; then
++ if echo "$STDOPTS"|${GREP} -q -- " $OPTARG "; then
+ OPTS="$OPTS $OPTARG"; shift $two;
+ else
+ echo "unrecognized option $OPTARG";
+@@ -102,7 +103,7 @@ while
+ exit 1;
+ fi ;;
+ p|-p|--parser)
+- if echo "$STDPARSERS"|grep -q -- " $OPTARG "; then
++ if echo "$STDPARSERS"|${GREP} -q -- " $OPTARG "; then
+ PARSER="$OPTARG"; shift $two;
+ else
+ echo "unrecognized parser generator $OPTARG";
+@@ -163,7 +164,7 @@ while [ $finished != yes ]; do
+ else
+ echo "$HELP";
+ fi
+- else if echo "$CHOICES" | grep -q -- " $ans "; then
++ else if echo "$CHOICES" | ${GREP} -q -- " $ans "; then
+ finished=yes;
+ else echo " unrecognized choice $ans"; fi; fi
+ done
+@@ -251,7 +252,7 @@ fi
+
+ echo "Please indicate which of the following standard options $NAME will use:"
+ for op in $STDOPTS; do
+- if echo " $OPTS "|grep -q -- " $op "; then
++ if echo " $OPTS "|${GREP} -q -- " $op "; then
+ true;
+ else
+ echo -n " $op? [yN] "; read ans;
+@@ -279,7 +280,7 @@ if [ "$AUTHOR" = "" ]; then
+ # Give NIS a try
+ AUTHOR=`ypmatch $USER passwd.byname|$AWK -F: '{ print $5; }'`
+ fi
+- if echo $AUTHOR | grep -q -- "\,"; then
++ if echo $AUTHOR | ${GREP} -q -- "\,"; then
+ X=`expr index "$AUTHOR" ","`
+ X=`expr $X - 1` || true
+ AUTHOR=`expr substr "$AUTHOR" 1 $X` || true
+@@ -325,7 +326,7 @@ cd "$NAME"
+ # Create a small awk script to select the appropriate options fragments
+
+ for op in $STDOPTS; do
+- if echo " $OPTS " | grep -q -- " $op " ; then
++ if echo " $OPTS " | ${GREP} -q -- " $op " ; then
+ # lines like "@item --output=@var{name}" are not special
+ cat >>optionsub <<EOF
+ /^@$op@\$/,/^@@\$/{if(\$0~/^@.*@\$/)next}
+@@ -375,7 +376,7 @@ for LIB in $SKELETONS; do
+ fi
+ process_file <$DIR/$i |$AWK -f optionsub >$i
+ if [ -x $DIR/$i ]; then chmod +x $i; fi
+- PROCESSED=`awk "BEGIN{print $PROCESSED+1}"`
++ PROCESSED=`${AWK} "BEGIN{print $PROCESSED+1}"`
+ fi
+ done
+ fi
+@@ -402,7 +403,7 @@ fi
+
+ # insert language-specific macros into configure.in
+ insert(){
+-if echo "$PROJECT_LANG"|grep -F -q -- " $1 "; then
++if echo "$PROJECT_LANG"|${GREP} -F -q -- " $1 "; then
+ echo "using $1 - adding $2 to configure.in"
+ $AWK "{print}/^AC_PROG_CC/{print \"$2\"}" \
+ configure.in >tmp && mv tmp configure.in
+--
+1.6.3.2
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list