Index: head/misc/magicpoint/Makefile
===================================================================
--- head/misc/magicpoint/Makefile	(revision 375618)
+++ head/misc/magicpoint/Makefile	(revision 375619)
@@ -1,104 +1,106 @@
 # Created by: itojun@itojun.org
 # $FreeBSD$
 
 PORTNAME=	magicpoint
 PORTVERSION=	1.13a
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES?=	misc
 MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X11-based presentation tool
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png \
 		libmng.so:${PORTSDIR}/graphics/libmng
 RUN_DEPENDS+=	pnmscale:${PORTSDIR}/graphics/netpbm
 
 MAKE_JOBS_UNSAFE=	yes
 
-USES=		imake:env pkgconfig
+USES=		imake:env perl5 pkgconfig
+USE_PERL5=	run
 USE_XORG=	x11 xext xmu xt sm ice xi xtst
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-vflib --enable-locale
+CONFIGURE_ENV=	mgp_cv_path_perl=${PERL}
 CPPFLAGS+=	-I..
 LATE_INSTALL_ARGS=	install.man
 
 PORTDOCS=	${DOCS} sample emacs-lisp scripts
 DOCS=		COPYRIGHT COPYRIGHT.jp FAQ README README.fonts \
 		README.fonts.jp README.lang RELNOTES SYNTAX TODO.jp \
 		USAGE USAGE.jp
 SAMPLES=	README README.jp cloud.jpg dad.eps dad.jpg default.mgp \
 		embed-jp.mgp embed.mgp gradation-jp.mgp \
 		gradation.mgp mgp-old1.jpg mgp-old2.jpg mgp-old3.jpg \
 		mgp.mng mgp1.jpg mgp2.jpg mgp3.jpg mgp3.xbm mgprc-sample \
 		multilingual.mgp sample-fr.mgp sample-jp.mgp sample.mgp \
 		sendmail6-jp.mgp sendmail6.mgp tutorial-jp.mgp \
 		tutorial.mgp v6-jp.mgp v6.mgp v6header.eps v6header.jpg
 EMACS_LISPS=	mgp-mode.el
 EMACS_LISPS_MGP=COPYING README mgp.el mgp.sty sample.tex
 SAMPLE_SCRIPTS=	eqn2eps.sh tex2eps.sh mgp2html.pl mgp2latex.pl
 
 
 OPTIONS_DEFINE=	FREETYPE XFT GIF DOCS
 OPTIONS_DEFAULT=FREETYPE XFT GIF
 NO_OPTIONS_SORT=yes
 
 FREETYPE_CONFIGURE_ENABLE=	freetype
 XFT_USES=	iconv
 XFT_USE=	XORG=xft
 XFT_LIB_DEPENDS=	libttf.so:${PORTSDIR}/print/freetype
 XFT_CONFIGURE_ENABLE=	xft2
 XFT_CONFIGURE_ON=	--enable-freetype-charset16
 GIF_CONFIGURE_ENABLE=	gif
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 GIF_CPPFLAGS=		-I${LOCALBASE}/include
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's|-lungif|-lgif|' \
 		-e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \
 		${WRKSRC}/configure
 
 post-configure:
 	cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${XMKMF} ${XMKMF_ARGS}
 	cd ${WRKSRC}/contrib/xmindpath && \
 		${SH} ${CONFIGURE_SCRIPT} --prefix=${PREFIX}
 	${REINPLACE_CMD} -e 's|freetype1/freetype|freetype1|g' \
 		${WRKSRC}/Makefile ${WRKSRC}/image/Makefile
 
 post-build:
 	cd ${WRKSRC}/contrib/xmindpath && \
 		${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/contrib/xmindpath/xmindpath.1 \
 		${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \
 		${STAGEDIR}${PREFIX}/bin/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/sample
 	cd ${WRKSRC}/sample && \
 		${INSTALL_DATA} ${SAMPLES} ${STAGEDIR}${DOCSDIR}/sample/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp
 	cd ${WRKSRC}/contrib && \
 		${INSTALL_DATA} ${EMACS_LISPS} \
 		${STAGEDIR}${DOCSDIR}/emacs-lisp/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el
 	cd ${WRKSRC}/contrib/mgp-el && \
 		${INSTALL_DATA} ${EMACS_LISPS_MGP} \
 		${STAGEDIR}${DOCSDIR}/emacs-lisp/mgp-el/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/scripts
 	cd ${WRKSRC}/contrib && \
 		${INSTALL_SCRIPT} ${SAMPLE_SCRIPTS} \
 		${STAGEDIR}${DOCSDIR}/scripts/
 .endif
 
 .include <bsd.port.mk>
Index: head/misc/magicpoint/files/patch-gif.c
===================================================================
--- head/misc/magicpoint/files/patch-gif.c	(revision 375618)
+++ head/misc/magicpoint/files/patch-gif.c	(revision 375619)
@@ -1,81 +1,147 @@
---- image/gif.c.orig	2000-03-07 07:59:56.000000000 +0100
-+++ image/gif.c	2012-06-02 09:10:25.000000000 +0200
-@@ -19,6 +19,17 @@
+--- image/gif.c.orig	2000-03-07 06:59:56 UTC
++++ image/gif.c
+@@ -15,10 +15,31 @@
+ 
+ #ifdef USE_GIF
+ 
++#include <stdlib.h>
+ #include "image.h"
  #include <gif_lib.h>
  
  static void
++#if GIFLIB_MAJOR >= 5
++localPrintGifError(int ErrorCode)
++#else
 +localPrintGifError(void)
++#endif
 +{
++#if GIFLIB_MAJOR >= 5
++    char *Err = GifErrorString(ErrorCode);
++#else
 +    char *Err = GifErrorString();
++    int ErrorCode = GifError();
++#endif
 +
 +    if (Err != NULL)
 +        fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
 +    else
-+        fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
++        fprintf(stderr, "\nGIF-LIB undefined error %d.\n", ErrorCode);
 +}
 +
 +static void
  tellAboutImage(name, gifp)
  	char *name;
  	GifFileType *gifp;
-@@ -87,13 +98,13 @@
+@@ -50,7 +71,11 @@ gifLoad(fullname, name, verbose)
+ 	ColorMapObject *ColorMap;
+ 	GifColorType *ColorMapEntry;
+ 
++#if GIFLIB_MAJOR >= 5
++	GifFile = DGifOpenFileName(fullname, NULL);
++#else
+ 	GifFile = DGifOpenFileName(fullname);
++#endif
+ 	if (GifFile == NULL)
+ 		return NULL;
+ 
+@@ -87,13 +112,21 @@ gifLoad(fullname, name, verbose)
  	/* Scan the content of the GIF file and load the image(s) in: */
  	do {
  		if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) {
 -			PrintGifError();
++#if GIFLIB_MAJOR >= 5
++			localPrintGifError(GifFile->Error);
++#else
 +			localPrintGifError();
++#endif
  			exit(-1);
  		}
  		switch (RecordType) {
  		case IMAGE_DESC_RECORD_TYPE:
  			if (DGifGetImageDesc(GifFile) == GIF_ERROR) {
 -				PrintGifError();
++#if GIFLIB_MAJOR >= 5
++				localPrintGifError(GifFile->Error);
++#else
 +				localPrintGifError();
++#endif
  				exit(-1);
  			}
  			Row = GifFile->Image.Top; /* Image Position relative to Screen. */
-@@ -113,7 +124,7 @@
+@@ -113,7 +146,11 @@ gifLoad(fullname, name, verbose)
  							     j += InterlacedJumps[i]) {
  					if (DGifGetLine(GifFile, &ScreenBuffer[j][Col],
  					    Width) == GIF_ERROR) {
 -					    PrintGifError();
++#if GIFLIB_MAJOR >= 5
++					    localPrintGifError(GifFile->Error);
++#else
 +					    localPrintGifError();
++#endif
  					    exit(-1);
  					}
  				}
-@@ -122,7 +133,7 @@
+@@ -122,7 +159,11 @@ gifLoad(fullname, name, verbose)
  				for (i = 0; i < Height; i++) {
  					if (DGifGetLine(GifFile, &ScreenBuffer[Row++][Col],
  					    Width) == GIF_ERROR) {
 -						PrintGifError();
++#if GIFLIB_MAJOR >= 5
++						localPrintGifError(GifFile->Error);
++#else
 +						localPrintGifError();
++#endif
  						exit(-1);
  					}
  				}
-@@ -131,7 +142,7 @@
+@@ -131,7 +172,11 @@ gifLoad(fullname, name, verbose)
  		case EXTENSION_RECORD_TYPE:
  			/* Skip any extension blocks in file: */
  			if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) {
 -				PrintGifError();
++#if GIFLIB_MAJOR >= 5
++				localPrintGifError(GifFile->Error);
++#else
 +				localPrintGifError();
++#endif
  				exit(-1);
  			}
  			/* very adhoc transparency support */
-@@ -141,7 +152,7 @@
+@@ -141,7 +186,11 @@ gifLoad(fullname, name, verbose)
  			}
  			while (Extension != NULL) {
  				if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) {
 -					PrintGifError();
++#if GIFLIB_MAJOR >= 5
++					localPrintGifError(GifFile->Error);
++#else
 +					localPrintGifError();
++#endif
  					exit(-1);
  				}
  			}
-@@ -180,7 +191,7 @@
+@@ -180,7 +229,11 @@ gifLoad(fullname, name, verbose)
  	}
  
  	if (DGifCloseFile(GifFile) == GIF_ERROR) {
 -		PrintGifError();
++#if GIFLIB_MAJOR >= 5
++		localPrintGifError(GifFile->Error);
++#else
 +		localPrintGifError();
++#endif
  		exit(-1);
  	}
  
+@@ -196,7 +249,11 @@ gifIdent(fullname, name)
+ 	GifFileType *gifp;
+ 	int ret;
+ 
++#if GIFLIB_MAJOR >= 5
++	gifp = DGifOpenFileName(fullname, NULL);
++#else
+ 	gifp = DGifOpenFileName(fullname);
++#endif
+ 	if (gifp == NULL)
+ 		ret = 0;
+ 	else {