Index: head/games/tuxpaint/Makefile
===================================================================
--- head/games/tuxpaint/Makefile	(revision 399413)
+++ head/games/tuxpaint/Makefile	(revision 399414)
@@ -1,68 +1,62 @@
 # Created by: Alejandro Pulver <alejandro@varnet.biz>
 # $FreeBSD$
 
 PORTNAME=	tuxpaint
 PORTVERSION=	0.9.22
 PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drawing program designed for young children
 
 LICENSE=	GPLv2 # (or later)
 LICENSE_FILE=	${WRKSRC}/docs/COPYING.txt
 
 LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi \
 		libpaper.so:${PORTSDIR}/print/libpaper
 RUN_DEPENDS=	anytopnm:${PORTSDIR}/graphics/netpbm \
 		bash:${PORTSDIR}/shells/bash
 
 USES=		gettext gmake gperf pkgconfig shebangfix
 SHEBANG_FILES=	src/tuxpaint-import.sh
 USE_GNOME=	librsvg2
 USE_SDL=	image mixer sdl ttf pango
 MAKE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PREFIX="${PREFIX}" \
 		MAN_PREFIX="${STAGEDIR}${MANPREFIX}/man" \
 		DEVMAN_PREFIX="${STAGEDIR}${MANPREFIX}/man" \
 		X11_ICON_PREFIX="${STAGEDIR}${PREFIX}/share/pixmaps" \
 		GNOME_PREFIX="${PREFIX}" \
 		ARCH_INSTALL="" \
 		OPTFLAGS="${CFLAGS} -DHAVE_STRCASESTR" \
 		SHARED_FLAGS="-shared -fPIC" \
 		GPERF="${GPERF}"
 
 INSTALL_TARGET=	install-gettext install-im install-magic-plugins \
 		install-magic-plugin-dev install-default-config \
 		install-example-stamps install-example-starters \
 		install-gnome install-icon install-bin install-importscript \
 		install-data install-doc install-man
 
 PORTDOCS=	*
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} <= 901000
-CFLAGS+=	-Dfmemopen_alternative
-.endif
-
 post-extract:
 	@${CHMOD} -R a+rX ${WRKSRC}
 	@${RM} -rf ${WRKSRC}/fonts/locale/vi_docs
 
 post-patch:
 .for file in src/tuxpaint-import.sh src/tp_magic_api.h.in src/tuxpaint.conf \
 	hildon/tuxpaint.conf
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/${file}
 .endfor
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tuxpaint
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/tuxpaint/plugins/*.so
 
 .include <bsd.port.mk>
Index: head/games/tuxpaint/files/patch-Makefile
===================================================================
--- head/games/tuxpaint/files/patch-Makefile	(revision 399413)
+++ head/games/tuxpaint/files/patch-Makefile	(revision 399414)
@@ -1,50 +1,50 @@
---- Makefile.orig	2013-03-18 11:17:31.189596000 +0000
-+++ Makefile	2010-10-19 01:08:15.000000000 +0900
-@@ -143,9 +143,9 @@
+--- Makefile.orig	2014-08-19 07:28:33 UTC
++++ Makefile
+@@ -143,9 +143,9 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tu
  
  # Docs and man page:
  DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint
 -DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev
 -MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
 -DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
 +DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint/dev
 +MAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
 +DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
  
  # BASH tab-completion file:
  COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d
-@@ -610,8 +607,8 @@
+@@ -610,8 +610,8 @@ install-default-config:
  	@echo
  	@echo "...Installing default config file..."
  	@install -d $(CONFDIR)
 -	@cp src/tuxpaint.conf $(CONFDIR)
 -	@chmod 644 $(CONFDIR)/tuxpaint.conf
 +	@cp src/tuxpaint.conf $(CONFDIR)/tuxpaint.conf.sample
 +	@chmod 644 $(CONFDIR)/tuxpaint.conf.sample
  
  # Install BASH completion file:
  .PHONY: install-bash-completion
-@@ -1152,10 +1143,10 @@
+@@ -1152,10 +1152,10 @@ tp-magic-config:	src/tp-magic-config.sh.
  	@echo "...Generating 'Magic' tool API configuration script..."
  	@sed -e s/__VERSION__/$(VER_VERSION)/ \
  		-e s/__APIVERSION__/$(MAGIC_API_VERSION)/ \
 -		-e s=__INCLUDE__=$(INCLUDE_PREFIX)/tuxpaint= \
 -		-e s=__DATAPREFIX__=$(DATA_PREFIX)= \
 -		-e s=__PLUGINPREFIX__=$(MAGIC_PREFIX)= \
 -		-e s=__PLUGINDOCPREFIX__=$(DOC_PREFIX)/magic-docs= \
 +		-e s=__INCLUDE__=$(patsubst $(DESTDIR)%,%,$(INCLUDE_PREFIX))/tuxpaint= \
 +		-e s=__DATAPREFIX__=$(patsubst $(DESTDIR)%,%,$(DATA_PREFIX))= \
 +		-e s=__PLUGINPREFIX__=$(patsubst $(DESTDIR)%,%,$(MAGIC_PREFIX))= \
 +		-e s=__PLUGINDOCPREFIX__=$(patsubst $(DESTDIR)%,%,$(DOC_PREFIX))/magic-docs= \
  		src/tp-magic-config.sh.in \
  		> tp-magic-config
  
-@@ -1178,7 +1169,7 @@
+@@ -1178,7 +1178,7 @@ linux_PLUGIN_LIBS:=
  PLUGIN_LIBS:=$($(OS)_PLUGIN_LIBS)
  
  #MAGIC_CFLAGS:=-g3 -O2 -fvisibility=hidden -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
 -MAGIC_CFLAGS:=-g3 -O2 -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
 +MAGIC_CFLAGS:=$(OPTFLAGS) -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
  SHARED_FLAGS:=-shared -fpic -Wl,--warn-shared-textrel
  
  MAGIC_C:=$(wildcard magic/src/*.c)