Index: head/math/reduce/Makefile
===================================================================
--- head/math/reduce/Makefile	(revision 489703)
+++ head/math/reduce/Makefile	(revision 489704)
@@ -1,67 +1,65 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	reduce
 PORTVERSION=	20180117
 PORTREVISION=	2
 CATEGORIES=	math lang
 MASTER_SITES=	SF/${PORTNAME}-algebra/${SFSUBDIR}/
 DISTNAME=	Reduce-svn4372-src
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	REDUCE Codemist Standard Lisp general-purpose computer system
 
 LICENSE=	BSD2CLAUSE
 
 BROKEN_aarch64=		fails to install: Reduce-svn4372-src/cslbuild/aarch64-unknown-freebsd11.1/csl/reduce.img: No such file or directory
 BROKEN_armv6=		fails to compile: redfront.h:118:12: conflicting types for '__wcwidth'
 BROKEN_powerpc64=	fails to compile: arith01.cpp: 'statuc' does not name a type
 
 RUN_DEPENDS=	gnuplot:math/gnuplot
 
 LIB_DEPENDS+=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 MAKE_JOBS_UNSAFE=	yes
 
 SFSUBDIR=	snapshot_2018-01-17
 
 USES=		autoreconf:build libtool gmake ncurses
 TARGET_SDIR=	${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
-CONFIGURE_ARGS=	--build=${TARGET_SDIR}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CPPFLAGS+=	-I${NCURSESINC}
 
 # Avoid GNU_CONFIGURE as it breaks staging
 HAS_CONFIGURE=	yes
 ALL_TARGET=
 
 USE_XORG=	x11 xext xorgproto xft
 USES+=		jpeg
 CONFIGURE_ARGS=	--with-csl
 CPPFLAGS+=	`freetype-config --cflags`
 LDFLAGS+=	`freetype-config --libs`
 
 REDUCE_BINS=	${WRKSRC}/cslbuild/${TARGET_SDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${REDUCE_BINS}/csl/reduce.img ${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${REDUCE_BINS}/csl/reduce ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/runcsl.sh ${STAGEDIR}${PREFIX}/bin/redcsl
 	${INSTALL_MAN} ${FILESDIR}/redcsl.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${MKDIR} ${STAGEDIR}${DATADIR}/reduce.doc
 	(cd ${REDUCE_BINS}/csl/reduce.doc && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/reduce.doc)
 	${MKDIR} ${STAGEDIR}${PREFIX}/${FONTDIR}
 	(cd ${REDUCE_BINS}/csl/reduce.fonts && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/reduce.fonts)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/manual.pdf\
 	    ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/primers/*.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/math/reduce-psl/Makefile
===================================================================
--- head/math/reduce-psl/Makefile	(revision 489703)
+++ head/math/reduce-psl/Makefile	(revision 489704)
@@ -1,58 +1,56 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	reduce
 PORTVERSION=	20181123
 CATEGORIES=	math lang
 MASTER_SITES=	SF/reduce-algebra/${SFSUBDIR}/
 PKGNAMESUFFIX=	-psl
 DISTNAME=	Reduce-svn4829-src
 
 MAINTAINER=	pfg@FreeBSD.org
 COMMENT=	REDUCE Portable Standard Lisp general-purpose algebra system
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		autoreconf:build libtool gmake ncurses
 
 SFSUBDIR=	snapshot_2018-11-23
 
 TARGET_SDIR=	${ARCH:S/amd64/x86_64/}-unknown-${OPSYS:tl}${OSREL}
-CONFIGURE_ARGS=	--build=${TARGET_SDIR}
-WRKSRC=		${WRKDIR}/${DISTNAME}
 CPPFLAGS+=	-I${NCURSESINC}
 
 # Avoid GNU_CONFIGURE as it breaks staging
 HAS_CONFIGURE=	yes
 ALL_TARGET=
 
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST=		${.CURDIR}/pkg-plist.${ARCH}
 
 CONFIGURE_ARGS=	--with-psl
 
 REDUCE_BINS=	${WRKSRC}/pslbuild/${TARGET_SDIR}
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${FILESDIR}/runpsl.sh ${STAGEDIR}${PREFIX}/bin/redpsl
 	${INSTALL_MAN} ${FILESDIR}/redpsl.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	${MKDIR} ${STAGEDIR}${DATADIR}/psl
 	${INSTALL_PROGRAM} ${REDUCE_BINS}/psl/bpsl ${STAGEDIR}${DATADIR}/psl/
 	(cd ${REDUCE_BINS}/psl && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/psl "! -name bpsl")
 	${MKDIR} ${STAGEDIR}${PREFIX}/red
 	(cd ${REDUCE_BINS}/red && ${COPYTREE_SHARE} . \
 	    ${STAGEDIR}${DATADIR}/red)
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc//util/r38.pdf	\
 	    ${STAGEDIR}${DOCSDIR}/manual.pdf
 	${INSTALL_DATA} ${WRKSRC}/doc/primers/*.pdf \
 	    ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>