mingw-cvs Mailing List for MinGW - Minimalist GNU for Windows

Update of /cvsroot/mingw/portmaker/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27052/src

Modified Files:
	Makefile portmaker.sh 
Log Message:
	* lib/mingwPORT.functions (ask): Omit `()' if no default.
	  (isyes): Accept abbreviated `yes' argument.
	* src/Makefile (portmaker): Make it executable.
	* src/portmaker.sh (makeport): Remove obsolete reference...
	  (portmaker): ... and replace with this.
	  (ARCIVEHOME): Correct misspelling...
	  (ARCHIVEHOME): ... to this; add missing `/' in `http://...'.
	  (PORTPATH): Eval it.


Index: Makefile
===================================================================
RCS file: /cvsroot/mingw/portmaker/src/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile	26 Jun 2005 11:51:19 -0000	1.1
--- Makefile	12 Sep 2005 19:49:01 -0000	1.2
***************
*** 17,18 ****
--- 17,19 ----
  portmaker: portmaker.sh version.sh
  	$(SHELL) -c '. version.sh && sed -e "s/@VERSION@/$$VERSION/g" -e "s~@PREFIX@~$$PREFIX~g" $^ > $@'
+ 	chmod 755 $@

Index: portmaker.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/src/portmaker.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** portmaker.sh	26 Jun 2005 11:51:19 -0000	1.1
--- portmaker.sh	12 Sep 2005 19:49:01 -0000	1.2
***************
*** 1,4 ****
  #! /bin/sh
! # makeport
  
  VERSION=@VERSION@
--- 1,4 ----
  #! /bin/sh
! # portmaker
  
  VERSION=@VERSION@
***************
*** 14,18 ****
  ask "ARCHIVETYPE" "tar.gz" ARCHIVETYPE
  ask "ARCHIVEFILE" "$PACKAGE-$VERSION.$ARCHIVETYPE" ARCHIVEFILE
! ask "ARCHIVEHOME" "http:/www.${PACKAGE}.org" ARCHIVEHOME
  ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI
--- 14,18 ----
  ask "ARCHIVETYPE" "tar.gz" ARCHIVETYPE
  ask "ARCHIVEFILE" "$PACKAGE-$VERSION.$ARCHIVETYPE" ARCHIVEFILE
! ask "ARCHIVEHOME" "http://www.${PACKAGE}.org" ARCHIVEHOME
  ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI
***************
*** 26,33 ****
  ask "PORTPATH" "$PORTPATH" PORTPATH
  
! if [ ! -d $PORTPATH ]
! then
!   mkdir -p $PORTPATH
! fi
  cat <<EOD>$PORTPATH/mingwPORT.ini
  PACKAGE=$PACKAGE
--- 26,31 ----
  ask "PORTPATH" "$PORTPATH" PORTPATH
  
! eval PORTPATH=\"$PORTPATH\"
! [ -d "$PORTPATH" ] || mkdir -p "$PORTPATH"
  cat <<EOD>$PORTPATH/mingwPORT.ini
  PACKAGE=$PACKAGE
***************
*** 36,40 ****
  ARCHIVEFILE=$ARCHIVEFILE
  ARCHIVEPATH=$ARCHIVEPATH
! ARCIVEHOME=$ARCHIVEHOME
  DOWNLOADURI=$DOWNLOADURI
  SRCDIR=$SRCDIR
--- 34,38 ----
  ARCHIVEFILE=$ARCHIVEFILE
  ARCHIVEPATH=$ARCHIVEPATH
! ARCHIVEHOME=$ARCHIVEHOME
  DOWNLOADURI=$DOWNLOADURI
  SRCDIR=$SRCDIR

Update of /cvsroot/mingw/portmaker
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27052

Modified Files:
	ChangeLog 
Log Message:
	* lib/mingwPORT.functions (ask): Omit `()' if no default.
	  (isyes): Accept abbreviated `yes' argument.
	* src/Makefile (portmaker): Make it executable.
	* src/portmaker.sh (makeport): Remove obsolete reference...
	  (portmaker): ... and replace with this.
	  (ARCIVEHOME): Correct misspelling...
	  (ARCHIVEHOME): ... to this; add missing `/' in `http://...'.
	  (PORTPATH): Eval it.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/mingw/portmaker/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChangeLog	26 Jun 2005 11:51:19 -0000	1.2
--- ChangeLog	12 Sep 2005 19:49:00 -0000	1.3
***************
*** 1,2 ****
--- 1,13 ----
+ 2005-09-12  Keith Marshall  <kei...@us...>
+ 
+ 	* lib/mingwPORT.functions (ask): Omit `()' if no default.
+ 	  (isyes): Accept abbreviated `yes' argument.
+ 	* src/Makefile (portmaker): Make it executable.
+ 	* src/portmaker.sh (makeport): Remove obsolete reference...
+ 	  (portmaker): ... and replace with this.
+ 	  (ARCIVEHOME): Correct misspelling...
+ 	  (ARCHIVEHOME): ... to this; add missing `/' in `http://...'.
+ 	  (PORTPATH): Eval it.
+ 
  2005-06-26  Earnie Boyd  <ea...@us...>
  

Update of /cvsroot/mingw/portmaker/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27052/lib

Modified Files:
	mingwPORT.functions 
Log Message:
	* lib/mingwPORT.functions (ask): Omit `()' if no default.
	  (isyes): Accept abbreviated `yes' argument.
	* src/Makefile (portmaker): Make it executable.
	* src/portmaker.sh (makeport): Remove obsolete reference...
	  (portmaker): ... and replace with this.
	  (ARCIVEHOME): Correct misspelling...
	  (ARCHIVEHOME): ... to this; add missing `/' in `http://...'.
	  (PORTPATH): Eval it.


Index: mingwPORT.functions
===================================================================
RCS file: /cvsroot/mingw/portmaker/lib/mingwPORT.functions,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mingwPORT.functions	3 Apr 2005 20:17:20 -0000	1.1
--- mingwPORT.functions	12 Sep 2005 19:49:00 -0000	1.2
***************
*** 4,17 ****
  # ask "User prompt" "Default response" VariableToStoreResponse
  function ask() {
!   echo -n "$1 ($2) "
    read $3
!   if [ -z "$(eval echo \${$3\})" ]
!     then
!       eval $3=\"$2\"
!   fi
  }
  
  # isyes $variable
  function isyes() {
!   echo $1 | grep '[Yy][Ee][Ss]' > /dev/null
  }
--- 4,18 ----
  # ask "User prompt" "Default response" VariableToStoreResponse
  function ask() {
!   echo -n "$1 "
!   [ -n "$2" ] && echo -n "($2) "
    read $3
!   [ -z "$(eval echo \${$3\})" ] && eval $3=\"$2\"
  }
  
  # isyes $variable
  function isyes() {
!   case $1 in
!     [Yy] | [Yy][Ee] | [Yy][Ee][Ss]) true ;;
!     *) false ;;
!   esac
  }