Index: head/editors/mined/Makefile
===================================================================
--- head/editors/mined/Makefile	(revision 383474)
+++ head/editors/mined/Makefile	(revision 383475)
@@ -1,58 +1,52 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	mined
 PORTVERSION=	2015.25
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Text mode editor with Unicode support
 
 LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	DOCS
 
 PORTDOCS=	*
 
 USES=		gmake desktop-file-utils
 MAKEFILE=	makefile
 REINPLACE_ARGS=	-i ""
 MAKE_ARGS=	GMAKE="${MAKE_CMD}" CC="${CC}" OPT="${CFLAGS}"
 INSTALL_TARGET=	localinstall
 MAKE_JOBS_UNSAFE=	yes
 
 PRFX2FIX=	src/makefile.bsd usrshare/conf_user/xinitrc.mined	\
 		src/minedaux.c man/mined.1 src/mkinclud.mak		\
 		src/makefile.gcc
 
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000
-USE_GCC=	yes
-.endif
-
 pre-configure:
 .for FILE in ${PRFX2FIX}
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/${FILE}
 .endfor
 
 pre-build:
 	${MV} ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.cc.bak
 	${CP} ${WRKSRC}/src/mkinclud.gcc ${WRKSRC}/src/mkinclud.cc
 	(if [ ! -f ${WRKSRC}/src/mkinclud.${CC:T} ] ; then	\
 	${LN} -sf ${WRKSRC}/src/mkinclud.cc ${WRKSRC}/src/mkinclud.${CC:T} ; \
 	fi)
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/usrshare/setup_install/mined.desktop	\
 		${STAGEDIR}${DESKTOPDIR}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mined
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/usrshare/package_doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}
 	${RM} -rf ${STAGEDIR}${DATADIR}/setup_install/cyg
 	@${RM} -rf ${STAGEDIR}${DOCSDIR}/CHANGES ${STAGEDIR}${DOCSDIR}/LICENCE.GPL
 	@${RM} -rf ${STAGEDIR}${DATADIR}/doc_user ${STAGEDIR}${DATADIR}/package_doc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/editors/mined/files/patch-src__mkinclud.gcc
===================================================================
--- head/editors/mined/files/patch-src__mkinclud.gcc	(revision 383474)
+++ head/editors/mined/files/patch-src__mkinclud.gcc	(revision 383475)
@@ -1,11 +1,20 @@
---- src/mkinclud.gcc.orig	2011-07-20 00:00:00.000000000 +0200
-+++ src/mkinclud.gcc	2011-11-20 18:44:14.000000000 +0100
-@@ -48,7 +48,7 @@
+--- src/mkinclud.gcc.orig	2015-03-08 23:00:00 UTC
++++ src/mkinclud.gcc
+@@ -48,7 +48,7 @@ GFLAGS= -ansi -Waggregate-return -Winlin
+ 
+ GCC3FLAGS=-Wdeclaration-after-statement -Wno-pragmas
+ # -Wunreachable-code deprecated
+-GCC4FLAGS=$(GCC3FLAGS) -Wno-pointer-sign -Wtype-limits
++GCC4FLAGS=$(GCC3FLAGS) -Wno-pointer-sign
+ 
+ # Warning options for newer gcc versions:
+ # (additional grep for the sake of MSys sed failing on CRLF from MinGW gcc)
+@@ -71,7 +71,7 @@ PROTOFLAGS=	-Wmissing-prototypes -Wretur
  # compilation mode options (optimisation and debug)
  
  # Optimization flag/level:
 -OPT= -O2
 +#OPT= -O2
  
  # Debugging option
  DEBUG= # -ggdb -gstabs