diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 25534139a453..a0d4ce40cc14 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,106 +1,107 @@
 # Created by: hsu
 
 PORTNAME=	scm
 PORTVERSION=	5f2
 PORTREVISION=	10
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} slib-3b5.zip slib-psd1-3.tar.gz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} slib-3b5.zip
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Scheme interpreter
 
 LICENSE=	LGPL21
 
 BROKEN_aarch64=		fails to link: missing sbrk
 BROKEN_powerpc64=	fails to build: "/wrkdirs/usr/ports/lang/scm/work/slib/lineio.scm": read-char: Wrong type in arg1 #f
 BROKEN_riscv64=		fails to link: missing sbrk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USES=		readline zip
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	--prefix=${PREFIX}
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS:=	${CFLAGS:N-O*} -O0
 CFLAGS+=	-Wall -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wcast-qual
 CFLAGS+=	-Wno-unused-label -Wno-uninitialized
 
 SUB_FILES=	require.scm
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
 PKGDEINSTALL=	${PKGINSTALL}
 
 INFO=		scm
 
 OPTIONS_DEFINE=		X11
 OPTIONS_SUB=		yes
 
 X11_USES=		xorg
 X11_USE=		xorg=ice,sm,x11,xext
 
 SCM_DATA=	COPYING COPYING.LESSER Iedline.scm Idiffer.scm \
 		Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \
 		Transcen.scm Tscript.scm build build.scm compile.scm \
 		hobbit.scm mkimpcat.scm patchlvl.h \
 		r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm
 SCM_DATA_X11=	keysymdef.scm x11.scm xatoms.scm xevent.scm
 SCM_MODULES=	byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \
 		ioext.so posix.so ramap.so record.so rgx.so sc2.so \
 		socket.so unix.so
 SCM_MODULES_X11=x.so
 
+.include <bsd.port.options.mk>
+
+.if ${ARCH:Mpowerpc64*}
+USES+=		compiler:gcc-c++11-lib
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 1300000
 LIB_DEPENDS+=	libgnuregex.so.[6-9]:devel/libgnuregex
 .endif
 
 .if ${PORT_OPTIONS:MX11}
 SCM_MODULES+=	${SCM_MODULES_X11}
 SCM_DATA+=	${SCM_DATA_X11}
 .endif
 
-.if ${ARCH} == "ia64"
-EXTRA_PATCHES+=	${FILESDIR}/ia64-patch
-ARCHOBJS=	continue-ia64.S
-.endif
-
 LIBEDIT_SUB1=	${CPPFLAGS}" "${LDFLAGS:M-L*}
 LIBEDIT_SUB2=	${LDFLAGS:M-L*}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include| ; \
 		 /strip/s|^|#|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%CFLAGS%%|${CFLAGS}|g ; \
 		 s|%%ARCHOBJS%%|${ARCHOBJS}|g ; \
 		 s|editline freebsd "" "|editline freebsd "${LIBEDIT_SUB1}| ; \
 		 s|-lreadline")$$|${LIBEDIT_SUB2} -lreadline")| ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm
 	@${REINPLACE_CMD} -e 's|__osf__|__FreeBSD__|' ${WRKSRC}/gmalloc.c
 	@${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c
 	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \
 		${WRKSRC}/xgen.scm
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g'	\
 		${WRKSRC}/*.info ${WRKSRC}/*.texi
 	${TOUCH} ${WRKSRC}/scm.core
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/scm ${WRKSRC}/scmlit \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/scm.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/scm
 	${INSTALL_DATA} ${WRKDIR}/require.scm ${SCM_DATA:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${PREFIX}/lib/scm
 	${INSTALL_LIB} ${SCM_MODULES:S|^|${WRKSRC}/|} \
 		${STAGEDIR}${PREFIX}/lib/scm
 	${TAR} -C ${STAGEDIR}${PREFIX}/lib/scm -xf ${DISTDIR}/${DISTFILES:Mslib*.tar.gz} '*.scm'
 	${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${STAGEDIR}${PREFIX}/lib/scm/slib/
 	${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .include <bsd.port.post.mk>
diff --git a/lang/scm/files/ia64-patch b/lang/scm/files/ia64-patch
deleted file mode 100644
index 4b8328df4a81..000000000000
--- a/lang/scm/files/ia64-patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- Makefile	2013-03-10 03:29:54.000000000 +0000
-+++ Makefile	2015-01-23 21:59:51.747074000 +0000
-@@ -104,5 +104,5 @@
- ofiles = scm.o time.o repl.o scl.o sys.o eval.o subr.o unif.o rope.o \
- 	continue.o findexec.o script.o debug.o
--# continue-ia64.o
-+ofiles+= continue-ia64.o
- ifiles = Init$(VERSION).scm Transcen.scm Link.scm Macro.scm Macexp.scm \
- 	Tscript.scm compile.scm Iedline.scm Idiffer.scm