- Update to 2.5

- Add license
- Fetch from GitLab
- Quiesce STRIP_CMD

3 files changed, 111 insertions, 82 deletions

diff --git a/graphics/grafx2/Makefile b/graphics/grafx2/Makefile
index 94e61788654e..baaeb88ff78f 100644
--- a/graphics/grafx2/Makefile
+++ b/graphics/grafx2/Makefile
@@ -2,32 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	grafx2
-PORTVERSION=	2.4.2035
-PORTREVISION=	4
+PORTVERSION=	2.5
+DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
-MASTER_SITES=	LOCAL/ehaupt
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-# Project site uses 'Content-Disposition: attachment; filename=' to provide the
-# filename. Unfortunately this is not supported by fetch. Therefore self host
-# distfile.
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Pixelart-oriented bitmap painting program
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libX11.so:x11/libX11 \
 		libpng.so:graphics/png
 
-USES=		gmake pkgconfig tar:tgz
+USES=		gmake pkgconfig tar:tgz iconv:wchar_t
 USE_SDL=	sdl image
+USE_GITLAB=	yes
+GL_ACCOUNT=	GrafX2
+GL_PROJECT=	grafX2
+GL_COMMIT=	60b5e5fd50acb01cbdc59f50e2c8f4b8786635c0
 
-WRKSRC=		${WRKDIR}/${PORTNAME}/src
+WRKSRC_SUBDIR=	src
 CFLAGS+=	-DHAVE_SYS_PARAM_H -DHAVE_SYS_UCRED_H -DHAVE_SYS_MOUNT_H
 
 OPTIONS_DEFINE=	TTF LUA
 TTF_DESC=	True Type font support
 OPTIONS_DEFAULT=TTF
 
+TTF_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+
+# disable recoil support until we have a librecoil port
+MAKE_ENV+=	NORECOIL=1
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTTF}
@@ -56,6 +61,6 @@ post-patch:
 		${WRKSRC}/setup.c
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/grafx2
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/grafx2
 
 .include <bsd.port.mk>
diff --git a/graphics/grafx2/distinfo b/graphics/grafx2/distinfo
index 7701b38dacf0..1b8d4a2f35ea 100644
--- a/graphics/grafx2/distinfo
+++ b/graphics/grafx2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475439629
-SHA256 (grafx2-2.4.2035-src.tgz) = 5818caea63cd3cf3318baf01dd20f81ec61e4514443000c80a41b68ab3f17a6b
-SIZE (grafx2-2.4.2035-src.tgz) = 721482
+TIMESTAMP = 1526283506
+SHA256 (GrafX2-grafX2-60b5e5fd50acb01cbdc59f50e2c8f4b8786635c0_GL0.tar.gz) = da62f807f34b398706f59c99056dc821031641ec88b669b281e5f5b34149797f
+SIZE (GrafX2-grafX2-60b5e5fd50acb01cbdc59f50e2c8f4b8786635c0_GL0.tar.gz) = 1746766
diff --git a/graphics/grafx2/pkg-plist b/graphics/grafx2/pkg-plist
index fb32eaed1c9a..12a2603552a4 100644
--- a/graphics/grafx2/pkg-plist
+++ b/graphics/grafx2/pkg-plist
@@ -1,72 +1,96 @@
 bin/grafx2
 share/applications/grafx2.desktop
-share/grafx2/fonts/8pxfont.png
-share/grafx2/fonts/PF_Arma_5__.png
-share/grafx2/fonts/PF_Easta_7_.png
-share/grafx2/fonts/PF_Easta_7__.png
-share/grafx2/fonts/PF_Ronda_7__.png
-share/grafx2/fonts/PF_Tempesta_5.png
-share/grafx2/fonts/PF_Tempesta_5_.png
-share/grafx2/fonts/PF_Tempesta_5__.png
-share/grafx2/fonts/PF_Tempesta_5___.png
-share/grafx2/fonts/PF_Tempesta_7.png
-share/grafx2/fonts/PF_Tempesta_7_.png
-share/grafx2/fonts/PF_Tempesta_7__.png
-share/grafx2/fonts/PF_Tempesta_7___.png
-share/grafx2/fonts/PF_Westa_7_.png
-share/grafx2/fonts/PF_Westa_7__.png
-share/grafx2/fonts/Tuffy.ttf
-share/grafx2/gfx2.gif
-share/grafx2/gfx2def.ini
-share/grafx2/scripts/samples_2.4/brush/ApplyColor.lua
-share/grafx2/scripts/samples_2.4/brush/Fisheye.lua
-share/grafx2/scripts/samples_2.4/brush/GrayscaleAvg.lua
-share/grafx2/scripts/samples_2.4/brush/GrayscaleDesat.lua
-share/grafx2/scripts/samples_2.4/brush/Halfsmooth.lua
-share/grafx2/scripts/samples_2.4/brush/Waves.lua
-share/grafx2/scripts/samples_2.4/demo/3DPalette.lua
-share/grafx2/scripts/samples_2.4/demo/Ellipse.lua
-share/grafx2/scripts/samples_2.4/demo/FlipPicture.lua
-share/grafx2/scripts/samples_2.4/demo/SierpinskyCarpet.lua
-share/grafx2/scripts/samples_2.4/demo/SierpinskyTriangle.lua
-share/grafx2/scripts/samples_2.4/demo/Spritesheet.lua
-share/grafx2/scripts/samples_2.4/demo/brush/Amigaball.lua
-share/grafx2/scripts/samples_2.4/demo/brush/ColorSphere.lua
-share/grafx2/scripts/samples_2.4/demo/brush/FindAA.lua
-share/grafx2/scripts/samples_2.4/demo/brush/Mandelbrot.lua
-share/grafx2/scripts/samples_2.4/libs/dawnbringer_lib.lua
-share/grafx2/scripts/samples_2.4/libs/memory.lua
-share/grafx2/scripts/samples_2.4/palette/Desaturate.lua
-share/grafx2/scripts/samples_2.4/palette/ExpandColors.lua
-share/grafx2/scripts/samples_2.4/palette/FillColorCube.lua
-share/grafx2/scripts/samples_2.4/palette/InvertedRGB.lua
-share/grafx2/scripts/samples_2.4/palette/Set3bit.lua
-share/grafx2/scripts/samples_2.4/palette/Set6bit.lua
-share/grafx2/scripts/samples_2.4/palette/SetC64Palette.lua
-share/grafx2/scripts/samples_2.4/palette/ShiftHue.lua
-share/grafx2/scripts/samples_2.4/picture/CellColourReducer.lua
-share/grafx2/scripts/samples_2.4/picture/DrawGridIsometric.lua
-share/grafx2/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
-share/grafx2/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
-share/grafx2/scripts/samples_2.4/picture/GlassGridFilter.lua
-share/grafx2/scripts/samples_2.4/picture/PaletteToPicture.lua
-share/grafx2/scripts/samples_2.4/picture/Pic2isometric.lua
-share/grafx2/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
-share/grafx2/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
-share/grafx2/scripts/samples_2.4/picture/Tiler.lua
-share/grafx2/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
-share/grafx2/skins/font_Classic.png
-share/grafx2/skins/font_DPaint.png
-share/grafx2/skins/font_Fairlight.png
-share/grafx2/skins/font_Fun.png
-share/grafx2/skins/font_Melon.png
-share/grafx2/skins/font_Seen.png
-share/grafx2/skins/skin_Aurora.png
-share/grafx2/skins/skin_DPaint.png
-share/grafx2/skins/skin_classic.png
-share/grafx2/skins/skin_modern.png
-share/grafx2/skins/skin_scenish.png
+%%DATADIR%%/fonts/5pxtinyfont.png
+%%DATADIR%%/fonts/8pxfont.png
+%%DATADIR%%/fonts/GrafX2_Black.gif
+%%DATADIR%%/fonts/GrafX2_Dark.gif
+%%DATADIR%%/fonts/PF_Arma_5__.png
+%%DATADIR%%/fonts/PF_Easta_7_.png
+%%DATADIR%%/fonts/PF_Easta_7__.png
+%%DATADIR%%/fonts/PF_Ronda_7__.png
+%%DATADIR%%/fonts/PF_Tempesta_5.png
+%%DATADIR%%/fonts/PF_Tempesta_5_.png
+%%DATADIR%%/fonts/PF_Tempesta_5__.png
+%%DATADIR%%/fonts/PF_Tempesta_5___.png
+%%DATADIR%%/fonts/PF_Tempesta_7.png
+%%DATADIR%%/fonts/PF_Tempesta_7_.png
+%%DATADIR%%/fonts/PF_Tempesta_7__.png
+%%DATADIR%%/fonts/PF_Tempesta_7___.png
+%%DATADIR%%/fonts/PF_Westa_7_.png
+%%DATADIR%%/fonts/PF_Westa_7__.png
+%%DATADIR%%/fonts/Tuffy.ttf
+%%DATADIR%%/fonts/colorfont.pcx
+%%DATADIR%%/gfx2.gif
+%%DATADIR%%/gfx2def.ini
+%%DATADIR%%/scripts/samples_2.4/brush/ApplyColor.lua
+%%DATADIR%%/scripts/samples_2.4/brush/Fisheye.lua
+%%DATADIR%%/scripts/samples_2.4/brush/GrayscaleAvg.lua
+%%DATADIR%%/scripts/samples_2.4/brush/GrayscaleDesat.lua
+%%DATADIR%%/scripts/samples_2.4/brush/Halfsmooth.lua
+%%DATADIR%%/scripts/samples_2.4/brush/Waves.lua
+%%DATADIR%%/scripts/samples_2.4/demo/3DPalette.lua
+%%DATADIR%%/scripts/samples_2.4/demo/Ellipse.lua
+%%DATADIR%%/scripts/samples_2.4/demo/FlipPicture.lua
+%%DATADIR%%/scripts/samples_2.4/demo/SierpinskyCarpet.lua
+%%DATADIR%%/scripts/samples_2.4/demo/SierpinskyTriangle.lua
+%%DATADIR%%/scripts/samples_2.4/demo/Spritesheet.lua
+%%DATADIR%%/scripts/samples_2.4/demo/brush/Amigaball.lua
+%%DATADIR%%/scripts/samples_2.4/demo/brush/ColorSphere.lua
+%%DATADIR%%/scripts/samples_2.4/demo/brush/FindAA.lua
+%%DATADIR%%/scripts/samples_2.4/demo/brush/Mandelbrot.lua
+%%DATADIR%%/scripts/samples_2.4/libs/dawnbringer_lib.lua
+%%DATADIR%%/scripts/samples_2.4/libs/memory.lua
+%%DATADIR%%/scripts/samples_2.4/palette/Desaturate.lua
+%%DATADIR%%/scripts/samples_2.4/palette/ExpandColors.lua
+%%DATADIR%%/scripts/samples_2.4/palette/FillColorCube.lua
+%%DATADIR%%/scripts/samples_2.4/palette/InvertedRGB.lua
+%%DATADIR%%/scripts/samples_2.4/palette/Set3bit.lua
+%%DATADIR%%/scripts/samples_2.4/palette/Set6bit.lua
+%%DATADIR%%/scripts/samples_2.4/palette/SetC64Palette.lua
+%%DATADIR%%/scripts/samples_2.4/palette/ShiftHue.lua
+%%DATADIR%%/scripts/samples_2.4/picture/CellColourReducer.lua
+%%DATADIR%%/scripts/samples_2.4/picture/DrawGridIsometric.lua
+%%DATADIR%%/scripts/samples_2.4/picture/DrawGridOrthogonal_RGB.lua
+%%DATADIR%%/scripts/samples_2.4/picture/DrawgridOrthogonal_Index.lua
+%%DATADIR%%/scripts/samples_2.4/picture/FontConvert.lua
+%%DATADIR%%/scripts/samples_2.4/picture/GlassGridFilter.lua
+%%DATADIR%%/scripts/samples_2.4/picture/PaletteToPicture.lua
+%%DATADIR%%/scripts/samples_2.4/picture/Pic2isometric.lua
+%%DATADIR%%/scripts/samples_2.4/picture/Rainbow-Dark2Bright.lua
+%%DATADIR%%/scripts/samples_2.4/picture/RemapImage2RGB.lua
+%%DATADIR%%/scripts/samples_2.4/picture/RemapImage2RGB_ed.lua
+%%DATADIR%%/scripts/samples_2.4/picture/RemapImageTo3bitPal.lua
+%%DATADIR%%/scripts/samples_2.4/picture/Tiler.lua
+%%DATADIR%%/scripts/samples_2.4/picture/XBitColourXpaceFromPalette.lua
+%%DATADIR%%/scripts/samples_2.4/picture/others-8bit/lib/ostro_other.lua
+%%DATADIR%%/scripts/samples_2.4/picture/others-8bit/ostro_oric.lua
+%%DATADIR%%/scripts/samples_2.4/picture/others-8bit/ostro_zx.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/bayer4_mo5.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/bayer4_to8.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/bayer.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/color.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/color_reduction.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/convex_hull.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/ostromoukhov.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/lib/thomson.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/none_mo5.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/none_to8.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/none_to9.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/ostro_mo5.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/ostro_to7.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/ostro_to8.lua
+%%DATADIR%%/scripts/samples_2.4/picture/thomson/ostro_to9.lua
+%%DATADIR%%/skins/font_Classic.png
+%%DATADIR%%/skins/font_DPaint.png
+%%DATADIR%%/skins/font_Fairlight.png
+%%DATADIR%%/skins/font_Fun.png
+%%DATADIR%%/skins/font_Melon.png
+%%DATADIR%%/skins/font_Seen.png
+%%DATADIR%%/skins/skin_Aurora.png
+%%DATADIR%%/skins/skin_DPaint.png
+%%DATADIR%%/skins/skin_classic.png
+%%DATADIR%%/skins/skin_modern.png
+%%DATADIR%%/skins/skin_scenish.png
+%%DATADIR%%/skins/unicode_0410-044F.png
 share/icons/grafx2.svg
 share/icons/grafx2.xpm