These are my changes to support the new argument-less configure scripts.

10 files changed, 49 insertions, 86 deletions

diff --git a/games/xmris/scripts/pre-configure b/games/xmris/scripts/pre-configure
index 8214f8999e32..ba6bc097353d 100644
--- a/games/xmris/scripts/pre-configure
+++ b/games/xmris/scripts/pre-configure
@@ -7,14 +7,14 @@ if [ $? != 0 ]; then
   exit 1
 fi
 
-mv $3/Imakefile $3/Imakefile.orig
+mv ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
 
-echo "LOCAL=/usr/local" >$3/Imakefile || exit 1;
+echo "LOCAL=/usr/local" >${WRKSRC}/Imakefile || exit 1;
 
 # remove extra space after \ in continuation lines
-sed -e 's/\\ $/\\/' <$3/Imakefile.orig >>$3/Imakefile || exit 1
+sed -e 's/\\ $/\\/' <${WRKSRC}/Imakefile.orig >>${WRKSRC}/Imakefile || exit 1
 
-echo "CDEBUGFLAGS=-O2" >>$3/Imakefile  || exit 1
-echo "MANSUFFIX=6" >>$3/Imakefile  || exit 1
+echo "CDEBUGFLAGS=-O2" >>${WRKSRC}/Imakefile  || exit 1
+echo "MANSUFFIX=6" >>${WRKSRC}/Imakefile  || exit 1
 
 exit 0
diff --git a/lang/Makefile b/lang/Makefile
index 71ebce9933fc..c05a52b11ba0 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,5 +1,5 @@
-# $Id$
+# $Id: Makefile,v 1.3 1994/08/23 10:20:23 jkh Exp $
 #
-SUBDIR=	tcl tclX
+SUBDIR=	p2c tcl tclX
 
 .include <bsd.port.subdir.mk>
diff --git a/lang/p2c/scripts/configure b/lang/p2c/scripts/configure
index 5ff74d5135f5..eab3c4597275 100644
--- a/lang/p2c/scripts/configure
+++ b/lang/p2c/scripts/configure
@@ -1,16 +1,14 @@
 #!/bin/sh
 
-if [ $# != 3 ]; then exit 1; fi
-
-cat >>$3/Makefile <<END || exit 1;
+cat >>${WRKSRC}/Makefile <<END || exit 1;
 all:
 	cd src; make OPT=-O
 END
 
-mv $3/src/p2cc.perl $3/src/p2cc.perl.orig || exit 1;
-sed -e 1s/--.*// < $3/src/p2cc.perl.orig > $3/src/p2cc.perl || exit 1;
+mv ${WRKSRC}/src/p2cc.perl ${WRKSRC}/src/p2cc.perl.orig || exit 1;
+sed -e 1s/--.*// < ${WRKSRC}/src/p2cc.perl.orig > ${WRKSRC}/src/p2cc.perl || exit 1;
 
-cat >>$3/src/Makefile <<END || exit 1;
+cat >>${WRKSRC}/src/Makefile <<END || exit 1;
 HOMEDIR=/usr/local/lib/p2c
 INCDIR=/usr/local/include/p2c
 BINDIR=/usr/local/bin
diff --git a/math/calc/scripts/configure b/math/calc/scripts/configure
index 1beb703997f7..1e3605568218 100644
--- a/math/calc/scripts/configure
+++ b/math/calc/scripts/configure
@@ -1,8 +1,6 @@
 #!/bin/sh
 
-if [ $# != 3 ]; then exit 1; fi
-
-F=$3/Makefile
+F=${WRKSRC}/Makefile
 
 chmod +w $F || exit 1;
 
diff --git a/print/dvips/scripts/configure b/print/dvips/scripts/configure
index 7f0bbfc8d672..051b660cfcd3 100644
--- a/print/dvips/scripts/configure
+++ b/print/dvips/scripts/configure
@@ -1,23 +1,19 @@
 #!/bin/sh
 
 
-if [ $# != 3 ]; then exit 1; fi
-
-SRCDIR=$3
-
 # paper size, default is no nor A4
 A4=n
 #default font cache directory: must be world writable
 CACHE=/tmp
 
 
-if [ ! -f $SRCDIR/MakeTeXPK.orig ]; then
-  mv $SRCDIR/MakeTeXPK $SRCDIR/MakeTeXPK.orig || exit 1
+if [ ! -f ${WRKSRC}/MakeTeXPK.orig ]; then
+  mv ${WRKSRC}/MakeTeXPK ${WRKSRC}/MakeTeXPK.orig || exit 1
 fi
 #find the resolutions
-RES=`awk '{if(/test $BDPI/) printf "%s ",$5}' < $SRCDIR/MakeTeXPK.orig`
+RES=`awk '{if(/test $BDPI/) printf "%s ",$5}' < ${WRKSRC}/MakeTeXPK.orig`
 # and the corresponding modes
-MODES=`awk -F= '{if(/MODE=[a-zA-Z]/) print $2}' < $SRCDIR/MakeTeXPK.orig`
+MODES=`awk -F= '{if(/MODE=[a-zA-Z]/) print $2}' < ${WRKSRC}/MakeTeXPK.orig`
 set $MODES
 echo "I need to set the mode of our printing/output device for the resolutions"
 echo "$RES dpi. (the mode must be in your modes.mf file)"
@@ -35,13 +31,13 @@ read answ; if [ "$answ" != "" ]; then CACHE=$answ; fi
   
 sed -e s:/usr/lib/tex:/usr/local/lib/texmf: \
     -e s:/LocalLibrary/Fonts/TeXFonts:$CACHE: \
-     $SUBST <$SRCDIR/MakeTeXPK.orig >$SRCDIR/MakeTeXPK
+     $SUBST <${WRKSRC}/MakeTeXPK.orig >${WRKSRC}/MakeTeXPK
 
 #configure config.ps
-if [ ! -f $SRCDIR/config.ps.orig ]; then
-  mv $SRCDIR/config.ps $SRCDIR/config.ps.orig || exit 1
+if [ ! -f ${WRKSRC}/config.ps.orig ]; then
+  mv ${WRKSRC}/config.ps ${WRKSRC}/config.ps.orig || exit 1
 fi
-RES=`awk '{if (/^D /) print $2}' <$SRCDIR/config.ps.orig`
+RES=`awk '{if (/^D /) print $2}' <${WRKSRC}/config.ps.orig`
 echo -n "what is the resolution of your printer (in dpi) [$RES]: ";
 read res; if [ "$res" = "" ]; then res=$RES; fi
 echo -n "do you want to use A4 paper? [$A4]: "
@@ -49,20 +45,20 @@ read answ; if [ "$answ" = "" ]; then answ=$A4; fi
 
 if [ $answ = y ]; then
   sed  -e 's/\(^\*\)\(.*A4\)/\2/' -e  's/^@ letterSize/*@ letterSize/' \
-	-e "s/^D $RES/D $res/" <$SRCDIR/config.ps.orig > $SRCDIR/config.ps
+	-e "s/^D $RES/D $res/" <${WRKSRC}/config.ps.orig > ${WRKSRC}/config.ps
 else
-  sed -e "s/^D $RES/D $res/" <$SRCDIR/config.ps.orig > $SRCDIR/config.ps
+  sed -e "s/^D $RES/D $res/" <${WRKSRC}/config.ps.orig > ${WRKSRC}/config.ps
 fi
 
 #makefile
-echo "TEXDIR=/usr/local/lib/texmf" >> $SRCDIR/Makefile || exit 1;
-echo "LOCALDIR=$CACHE" >> $SRCDIR/Makefile
-echo "TEXMACRODIR=\$(TEXDIR)/tex" >> $SRCDIR/Makefile
-echo "FIGPATH = .:..:\$(TEXDIR)/tex" >> $SRCDIR/Makefile
-echo "MANDIR=/usr/local/man/man1" >> $SRCDIR/Makefile
-echo "DEFS= -DTPIC -DDEBUG -DDEFRES=$res"  >> $SRCDIR/Makefile
-echo "OPT = -O2 -funsigned-char"  >> $SRCDIR/Makefile
-echo "BINDIR=/usr/local/bin"  >> $SRCDIR/Makefile
-echo "FLIBS=-lm" >> $SRCDIR/Makefile
+echo "TEXDIR=/usr/local/lib/texmf" >> ${WRKSRC}/Makefile || exit 1;
+echo "LOCALDIR=$CACHE" >> ${WRKSRC}/Makefile
+echo "TEXMACRODIR=\$(TEXDIR)/tex" >> ${WRKSRC}/Makefile
+echo "FIGPATH = .:..:\$(TEXDIR)/tex" >> ${WRKSRC}/Makefile
+echo "MANDIR=/usr/local/man/man1" >> ${WRKSRC}/Makefile
+echo "DEFS= -DTPIC -DDEBUG -DDEFRES=$res"  >> ${WRKSRC}/Makefile
+echo "OPT = -O2 -funsigned-char"  >> ${WRKSRC}/Makefile
+echo "BINDIR=/usr/local/bin"  >> ${WRKSRC}/Makefile
+echo "FLIBS=-lm" >> ${WRKSRC}/Makefile
 
 exit 0;
diff --git a/print/psutils-letter/scripts/configure b/print/psutils-letter/scripts/configure
index 1c702dec2aad..f740baf98d37 100644
--- a/print/psutils-letter/scripts/configure
+++ b/print/psutils-letter/scripts/configure
@@ -1,3 +1,3 @@
 #!/bin/sh
-chmod +x $3/maketext
+chmod +x ${WRKSRC}/maketext
 exit 0
diff --git a/print/tex/scripts/configure b/print/tex/scripts/configure
index d4d90c14bc7c..e29ded4b542a 100644
--- a/print/tex/scripts/configure
+++ b/print/tex/scripts/configure
@@ -1,13 +1,11 @@
 #!/bin/sh
 
-if [ $# != 3 ]; then exit 1; fi
-
 #
 # The subdirectory searching in kpathsearch sometimes  fails (don't know why)
 # so let's disable the feature (It can be reenabled with the proper environment
 # variables though.
 #
-cd $3/kpathsea || exit 1;
+cd ${WRKSRC}/kpathsea || exit 1;
 mv paths.h.in paths.h.in.orig || exit 1;
 sed -e s://:/: <paths.h.in.orig >paths.h.in || exit 1;
 
diff --git a/print/xdvi/scripts/configure b/print/xdvi/scripts/configure
index 8a19b3a88239..08fcea3324be 100644
--- a/print/xdvi/scripts/configure
+++ b/print/xdvi/scripts/configure
@@ -1,22 +1,17 @@
 #!/bin/sh
 
-if [ $# != 3 ]; then exit 1; fi
-
-SRCDIR=$3
-
 # paper size, default is no nor A4
 A4=n
 #default font cache directory: must be world writable
 CACHE=/tmp
 
-
-if [ ! -f $SRCDIR/MakeTeXPK.orig ]; then
-  mv $SRCDIR/MakeTeXPK $SRCDIR/MakeTeXPK.orig || exit 1
+if [ ! -f ${WRKSRC}/MakeTeXPK.orig ]; then
+  mv ${WRKSRC}/MakeTeXPK ${WRKSRC}/MakeTeXPK.orig || exit 1
 fi
 #find the resolutions
-RES=`awk '{if(/test $BDPI/) printf "%s ",$5}' < $SRCDIR/MakeTeXPK.orig`
+RES=`awk '{if(/test $BDPI/) printf "%s ",$5}' < ${WRKSRC}/MakeTeXPK.orig`
 # and the corresponding modes
-MODES=`awk -F= '{if(/MODE=[a-zA-Z]/) print $2}' < $SRCDIR/MakeTeXPK.orig`
+MODES=`awk -F= '{if(/MODE=[a-zA-Z]/) print $2}' < ${WRKSRC}/MakeTeXPK.orig`
 set $MODES
 echo "I need to set the mode of our printing/output device for the resolutions"
 echo "$RES dpi. (the mode must be in your modes.mf file)"
@@ -34,13 +29,13 @@ read answ; if [ "$answ" != "" ]; then CACHE=$answ; fi
   
 sed -e s:/usr/lib/tex:/usr/local/lib/texmf: \
     -e s:/LocalLibrary/Fonts/TeXFonts:$CACHE: \
-     $SUBST <$SRCDIR/MakeTeXPK.orig >$SRCDIR/MakeTeXPK
+     $SUBST <${WRKSRC}/MakeTeXPK.orig >${WRKSRC}/MakeTeXPK
 
 
 # Imakefile
-chmod +w  $SRCDIR/Imakefile 
-echo "OSDEFS=" >> $SRCDIR/Imakefile || exit 1;
-echo "OPTIONDEFS=-DUSE_PK -DGREY -DPS_GS -DMAKEPK -DBUTTONS" >> $SRCDIR/Imakefile
-echo "DEFAULT_FONT_PATH=/usr/local/lib/texmf/fonts/pk:$CACHE/pk"  >> $SRCDIR/Imakefile
-echo "DEFAULT_VF_PATH=/usr/local/lib/texmf/fonts/vf" >> $SRCDIR/Imakefile
+chmod +w  ${WRKSRC}/Imakefile 
+echo "OSDEFS=" >> ${WRKSRC}/Imakefile || exit 1;
+echo "OPTIONDEFS=-DUSE_PK -DGREY -DPS_GS -DMAKEPK -DBUTTONS" >> ${WRKSRC}/Imakefile
+echo "DEFAULT_FONT_PATH=/usr/local/lib/texmf/fonts/pk:$CACHE/pk"  >> ${WRKSRC}/Imakefile
+echo "DEFAULT_VF_PATH=/usr/local/lib/texmf/fonts/vf" >> ${WRKSRC}/Imakefile
 exit 0;
diff --git a/www/gn/scripts/configure b/www/gn/scripts/configure
index a2cd84f715bd..cd81783f0464 100644
--- a/www/gn/scripts/configure
+++ b/www/gn/scripts/configure
@@ -1,16 +1,5 @@
 #!/bin/sh
 #
-if [ $# -ne 3 ]; then
-	echo "This script should only be run by the Makefile."
-	exit 1
-fi
-
-# First arg is top level ports directory, second is current directory,
-# third is the directory containing the dist.
-#
-PDIR=$1
-CDIR=$2
-WDIR=$3
 
 hostname=`hostname`
 echo -n "Hostname of server machine? [$hostname] "
@@ -20,5 +9,5 @@ echo -n "URL to default WWW admin? [$maintainer] "
 read answer; if [ X$answer != X ]; then maintainer=$answer; fi
 sed -e "/GN_HOSTNAME/s/\".*\"/\"$hostname\"/" \
     -e "/MAINTAINER/s/\".*\"/\"$maintainer\"/" \
-    $WDIR/config.h >$WDIR/config.h.foo
-mv $WDIR/config.h.foo $WDIR/config.h
+    ${WRKSRC}/config.h >${WRKSRC}/config.h.foo
+mv ${WRKSRC}/config.h.foo ${WRKSRC}/config.h
diff --git a/x11-toolkits/iv/scripts/configure b/x11-toolkits/iv/scripts/configure
index 25f71cd4487c..4caffef6f41a 100644
--- a/x11-toolkits/iv/scripts/configure
+++ b/x11-toolkits/iv/scripts/configure
@@ -1,22 +1,11 @@
 #!/bin/sh
 #
-if [ $# -ne 3 ]; then
-	echo "This script should only be run by the Makefile."
-	exit 1
-fi
-
-# First arg is top level ports directory, second is current directory,
-# third is the directory containing the dist.
-#
-PDIR=$1
-CDIR=$2
-WDIR=$3
 
-touch ${WDIR}/src/config/freebsd.cf
-find ${WDIR} -name Makefile -print | xargs rm
+touch ${WRKSRC}/src/config/freebsd.cf
+find ${WRKSRC} -name Makefile -print | xargs rm
 xpath=`/usr/bin/which imake 2>/dev/null`
 if [ -n $xpath ]; then
 	xpath=`echo $xpath | sed 's;/bin/imake$;;'`
-	sed "s;/usr/X386;$xpath;" ${WDIR}/makefile >${WDIR}/makefile.foo
-	mv ${WDIR}/makefile.foo ${WDIR}/makefile
+	sed "s;/usr/X386;$xpath;" ${WRKSRC}/makefile >${WRKSRC}/makefile.foo
+	mv ${WRKSRC}/makefile.foo ${WRKSRC}/makefile
 fi