4 files changed, 30 insertions, 46 deletions

diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index e902a0bede1a..3a0c519e9002 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -13,6 +13,16 @@ MASTER_SITES=	http://www.FreeBSD.org/~andreas/apsfilter/download/
 MAINTAINER=	andreas@FreeBSD.org
 
 RUN_DEPENDS=	recode:${PORTSDIR}/converters/recode
+.if defined(BATCH)
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript55
+RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter
+RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig
+RUN_DEPENDS+=	cjpeg:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS+=	anytopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
+.endif
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/apsfilter
@@ -20,8 +30,9 @@ WRKSRC=		${WRKDIR}/apsfilter
 # make a2ps port happy in this early stage
 PAPERSIZE?=letter
 
+.if !defined(BATCH)
 pre-configure:
-	rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 # This was copied from bsd.port.mk because a missing post-clean target
 # is needed
@@ -42,5 +53,6 @@ clean:
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/apsfilter/scripts/configure b/print/apsfilter/scripts/configure
index 5ccfcaec068a..d29d1721adbb 100644
--- a/print/apsfilter/scripts/configure
+++ b/print/apsfilter/scripts/configure
@@ -2,32 +2,12 @@
 
 # $FreeBSD$
 
+# runs if BATCH is NOT defined
+
 #
 # configure - apsfilter package dependency configuration
 #
 
-if [ "${BATCH}" ]; then
-	/bin/mkdir -p ${WRKDIRPREFIX}${CURDIR}
-	: > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript55" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	cjpeg:${PORTSDIR}/graphics/jpeg" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	anytopnm:${PORTSDIR}/graphics/netpbm" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	exit
-fi
-
 /usr/bin/dialog --title "supported file types" --clear \
 	--checklist "\n\
 Select file types you want to print:" -1 -1 14	\
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index e902a0bede1a..3a0c519e9002 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -13,6 +13,16 @@ MASTER_SITES=	http://www.FreeBSD.org/~andreas/apsfilter/download/
 MAINTAINER=	andreas@FreeBSD.org
 
 RUN_DEPENDS=	recode:${PORTSDIR}/converters/recode
+.if defined(BATCH)
+RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript55
+RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter
+RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig
+RUN_DEPENDS+=	cjpeg:${PORTSDIR}/graphics/jpeg
+RUN_DEPENDS+=	anytopnm:${PORTSDIR}/graphics/netpbm
+RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2
+RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
+RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
+.endif
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/apsfilter
@@ -20,8 +30,9 @@ WRKSRC=		${WRKDIR}/apsfilter
 # make a2ps port happy in this early stage
 PAPERSIZE?=letter
 
+.if !defined(BATCH)
 pre-configure:
-	rm -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 # This was copied from bsd.port.mk because a missing post-clean target
 # is needed
@@ -42,5 +53,6 @@ clean:
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
 .endif
+.endif
 
 .include <bsd.port.mk>
diff --git a/print/apsfilter6/scripts/configure b/print/apsfilter6/scripts/configure
index 5ccfcaec068a..d29d1721adbb 100644
--- a/print/apsfilter6/scripts/configure
+++ b/print/apsfilter6/scripts/configure
@@ -2,32 +2,12 @@
 
 # $FreeBSD$
 
+# runs if BATCH is NOT defined
+
 #
 # configure - apsfilter package dependency configuration
 #
 
-if [ "${BATCH}" ]; then
-	/bin/mkdir -p ${WRKDIRPREFIX}${CURDIR}
-	: > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript55" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	html2ps:${PORTSDIR}/print/html2ps-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	transfig:${PORTSDIR}/print/transfig" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	cjpeg:${PORTSDIR}/graphics/jpeg" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	anytopnm:${PORTSDIR}/graphics/netpbm" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	bunzip2:${PORTSDIR}/archivers/bzip2" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	echo "RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter" \
-		>> ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
-	exit
-fi
-
 /usr/bin/dialog --title "supported file types" --clear \
 	--checklist "\n\
 Select file types you want to print:" -1 -1 14	\