[MinGW-cvs] portmaker/src portmaker.sh,1.5,1.6

[Keith M. <kei...@us...>]

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

Modified Files:
	portmaker.sh 
Log Message:
	* src/portmaker.sh (SRCDIR, PREFIX): Modified defaults.
	
	* template/mingwPORT.sh (SIGUSR1): Define `trap'...
	(ONTRACK): ...it sets this to `false'.

	* template/mingwPORT.messages (MSG_NOMKDIR, MSG_REFUSED): Renamed...
	(MSG_EMKDIR, MSG_EREFUSED): ...to these, respectively.
	(MSG_EABORT, MSG_EFAILED, MSG_EFATAL): New messages; defined.

	* template/mingwPORT.afterquestion (SIGUSR1): Raise it...
	(ARCHIVE): ...on failure to `untar' this...
	(MSG_EFATAL): ...failing with this.
	(MSG_NOMKDIR, MSG_REFUSED): Update references...
	(MSG_EMKDIR, MSG_EREFUSED): ...to use these instead.


Index: portmaker.sh
===================================================================
RCS file: /cvsroot/mingw/portmaker/src/portmaker.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** portmaker.sh	21 Apr 2006 19:26:08 -0000	1.5
--- portmaker.sh	9 Sep 2006 09:21:45 -0000	1.6
***************
*** 17,23 ****
  ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH \?
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI \?
! ask "SRCDIR" "\$HOME/src/${PACKAGE}-${VERSION}" SRCDIR \?
  ask "BUILDDIR" "./bld" BUILDDIR \?
! ask "PREFIX" "/mingw" PREFIX \?
  ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS \?
  ask "CXXFLAGS" "\\\$CFLAGS" CXXFLAGS \?
--- 17,23 ----
  ask "ARCHIVEPATH" "/tmp" ARCHIVEPATH \?
  ask "DOWNLOADURI" "http://ftp.gnu.org/gnu/$PACKAGE" DOWNLOADURI \?
! ask "SRCDIR" '${SRCROOT-"$HOME/src"}'"/${PACKAGE}-${VERSION}" SRCDIR \?
  ask "BUILDDIR" "./bld" BUILDDIR \?
! ask "PREFIX" '${PREFIX-"/mingw"}' PREFIX \?
  ask "CFLAGS" "-O3 -s -mms-bitfields -march=\\\`uname -m\\\`" CFLAGS \?
  ask "CXXFLAGS" "\\\$CFLAGS" CXXFLAGS \?