Index: ChangeLog
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/ChangeLog,v
retrieving revision 1.67
diff -a -u -u -0 -r1.67 ChangeLog
--- ChangeLog	17 Oct 2006 05:43:30 -0000	1.67
+++ ChangeLog	17 Oct 2006 13:54:14 -0000
@@ -0,0 +1,7 @@
+2006-10-17  Vin Shelton  <acs@xemacs.org>
+
+	* bin/cygport.in (cygconf):
+	Support override of all default configuration options.
+
+	* README:
+	Fix minor typos.
Index: README
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/README,v
retrieving revision 1.4
diff -a -u -r1.4 README
--- README	9 Aug 2006 21:47:38 -0000	1.4
+++ README	17 Oct 2006 13:54:16 -0000
@@ -272,7 +272,7 @@
 any, during the check command The default is to run 'make check' if the
 package is autotool-based, otherwise 'make test' is run.  If a package
 does not conform to this rule, then a src_test() function should be
-included in the packge .cygport.  For example:
+included in the .cygport file.  For example:
 
     src_test() {
         cd ${B}
@@ -300,7 +300,7 @@
 A number of helper commands are available for manually installing files
 to various locations.  These commands have names and syntax almost
 identical to their Gentoo counterparts.  When specifying directories,
-write as if your installing to the system; the scripts will do
+write as if you're installing to the system; the scripts will do
 everything under ${D} for you.  Some examples:
 
     # create directories
Index: bin/cygport.in
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/bin/cygport.in,v
retrieving revision 1.25
diff -a -u -r1.25 cygport.in
--- bin/cygport.in	17 Oct 2006 05:43:30 -0000	1.25
+++ bin/cygport.in	17 Oct 2006 13:54:16 -0000
@@ -713,9 +713,23 @@
 
 # standard configure call
 cygconf() {
-	local confargs="--prefix=/usr --exec-prefix=/usr --bindir=/usr/bin \
-		--sbindir=/usr/sbin --libexecdir=/usr/sbin --localstatedir=/var \
-		--sysconfdir=/etc"
+:	${CYGCONF_PREFIX:="--prefix=/usr"}
+:	${CYGCONF_EXEC_PREFIX:="--exec-prefix=/usr"}
+:	${CYGCONF_BINDIR:="--bindir=/usr/bin"}
+:	${CYGCONF_SBINDIR:="--sbindir=/usr/sbin"}
+:	${CYGCONF_LIBEXECDIR:="--libexecdir=/usr/sbin"}
+:	${CYGCONF_LOCALSTATEDIR:="--localstatedir=/var"}
+:	${CYGCONF_SYSCONFDIR:="--sysconfdir=/etc"}
+# autoconf 2.5x-specific
+:	${CYGCONF_DATADIR:="--datadir=/usr/share"}
+:	${CYGCONF_INFODIR:="--infodir=/usr/share/info"}
+:	${CYGCONF_MANDIR:="--mandir=/usr/share/man"}
+# autoconf 2.6x-specific
+:	${CYGCONF_DATAROOTDIR:="--datarootdir=/usr/share"}
+:	${CYGCONF_DOCDIR:="--docdir=/usr/share/doc/${P}"}
+	local confargs="$CYGCONF_PREFIX $CYGCONF_EXEC_PREFIX $CYGCONF_BINDIR \
+		$CYGCONF_SBINDIR $CYGCONF_LIBEXECDIR $CYGCONF_LOCALSTATEDIR \
+		$CYGCONF_SYSCONFDIR";
 	local confdir;
 
 	if [ -n "${CYGCONF_SOURCE}" -a -x ${CYGCONF_SOURCE}/configure ]
@@ -733,11 +747,10 @@
 
 	case "x$(grep -m 1 'GNU Autoconf' ${confdir}/configure | cut -d ' ' -f 6)" in
 		x2.60)
-			confargs+=" --datarootdir=/usr/share --docdir=/usr/share/doc/${P}"
+			confargs+=" $CYGCONF_DATAROOTDIR $CYGCONF_DOCDIR"
 			;;
 		*)
-			confargs+=" --datadir=/usr/share --infodir=/usr/share/info \
-				--mandir=/usr/share/man"
+			confargs+=" $CYGCONF_DATADIR $CYGCONF_INFODIR $CYGCONF_MANDIR"
 			;;
 	esac