Index: head/multimedia/libxspf/Makefile
===================================================================
--- head/multimedia/libxspf/Makefile	(revision 489669)
+++ head/multimedia/libxspf/Makefile	(revision 489670)
@@ -1,31 +1,30 @@
 # Created by: Ed Schouten <ed@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libxspf
 PORTVERSION=	1.2.0
 PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/libspiff/Sources/${PORTVERSION}
 
 MAINTAINER=	ed@FreeBSD.org
 COMMENT=	XSPF parsing library
 
 LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 # We need 0.7.5, which uses pkg-config
 BUILD_DEPENDS=	uriparser>=0.7.5:net/uriparser
 RUN_DEPENDS=	uriparser>=0.7.5:net/uriparser
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test
 
 USES=		libtool pkgconfig tar:bzip2
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 LIBS+=		-L${LOCALBASE}/lib -luriparser
 
 post-patch:
 	@${REINPLACE_CMD} 's|$$(libdir)/pkgconfig|$$(libdir)data/pkgconfig|' \
 	    ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/textproc/randlm/Makefile
===================================================================
--- head/textproc/randlm/Makefile	(revision 489669)
+++ head/textproc/randlm/Makefile	(revision 489670)
@@ -1,40 +1,39 @@
 # Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	randlm
 PORTVERSION=	0.2.5
 PORTREVISION=	15
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A toolkit for building randomized language models
 
 BUILD_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 RUN_DEPENDS=	${LOCALBASE}/include/google/sparse_hash_map:devel/sparsehash
 
 BROKEN_aarch64=		fails to compile: invalid output constraint =a in assembler
 BROKEN_armv6=		fails to compile: invalid output constraint =a in assembler
 BROKEN_powerpc64=	fails to compile: 'itr' does not name a type
 
-GNU_CONFIGURE=	yes
 USE_CXXSTD=	gnu++98
 USE_PERL5=	run
 USE_LDCONFIG=	yes
 USES=		autoreconf libtool compiler:c++11-lang
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	cd ${WRKSRC}/hadoop && ${MV} strings.cpp strings.cc && ${MV} strings.h s.h
 	${REINPLACE_CMD} -e s#strings.h#s.h# ${WRKSRC}/hadoop/r_compute_ngram_counts.cpp ${WRKSRC}/hadoop/m_compute_ngram_counts_batch.cpp
 	@${REINPLACE_CMD} -e 's,-L./,,' -e 's,-lLDHT,libLDHT.la,' \
 		-e 's,-lticpp,libticpp.la,' -e 's,-lRandLM,libRandLM.la,' \
 		${WRKSRC}/src/LDHT/Makefile.am \
 		${WRKSRC}/src/RandLM/Makefile.am
 
 .include <bsd.port.mk>