Page MenuHomeFreeBSD
Files F160274824

D28336.diff
No OneTemporary
Actions

D28336.diff
View Options

Index: head/graphics/mtpaint/Makefile
===================================================================
--- head/graphics/mtpaint/Makefile
+++ head/graphics/mtpaint/Makefile
@@ -2,12 +2,10 @@
# $FreeBSD$
PORTNAME= mtpaint
-PORTVERSION= 3.40
-PORTREVISION= 8
+PORTVERSION= 3.50.03
CATEGORIES= graphics
-MASTER_SITES= SF
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ed.arrakis@gmail.com
COMMENT= Simple painting program
LICENSE= GPLv3
@@ -15,35 +13,41 @@
LIB_DEPENDS= libpng.so:graphics/png \
libtiff.so:graphics/tiff \
- libgif.so:graphics/giflib \
libfreetype.so:print/freetype2
-USES= desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2
-USE_GNOME= gtk20
+USES= desktop-file-utils gmake gnome iconv jpeg pkgconfig tar:bzip2 xorg
+USE_GITHUB= yes
+GH_ACCOUNT= wjaguar
+GH_PROJECT= mtPaint
+GH_TAGNAME= 40bde45
+USE_GNOME= cairo gdkpixbuf2 gtk30
+USE_XORG= x11
HAS_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MAN1PREFIX}/man/man1 \
+CONFIGURE_ARGS= --prefix=${PREFIX} --mandir=${MANPREFIX}/man/man1 \
--localedir=${PREFIX}/share/locale \
- gtk2 cflags asneeded ft jpeg tiff man GIF
+ asneeded gtk3 cflags ft jpeg man tiff
CFLAGS+= -fcommon
LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
-OPTIONS_DEFINE= LCMS2 OPENJPEG NLS
+PORTDOCS= NEWS README
+
+OPTIONS_DEFINE= DOCS LCMS2 NLS OPENJPEG WEBP
OPTIONS_DEFAULT= LCMS2 OPENJPEG
-OPTIONS_SUB= yes
+OPTIONS_SUB= yes
LCMS2_LIB_DEPENDS= liblcms2.so:graphics/lcms2
LCMS2_CONFIGURE_ON= lcms2
LCMS2_CONFIGURE_OFF= nolcms
-
-OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
-OPENJPEG_CONFIGURE_ON= jp2
+NLS_USES= gettext
+NLS_CONFIGURE_ON= intl
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
OPENJPEG_LIB_DEPENDS_OFF=libjasper.so:graphics/jasper
+OPENJPEG_CONFIGURE_ON= jp2v2
OPENJPEG_CONFIGURE_OFF= jasper
+WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
+WEBP_CONFIGURE_ON= webp
-NLS_USES= gettext
-NLS_CONFIGURE_ON= intl
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \
@@ -53,8 +57,13 @@
${INSTALL_DATA} ${WRKSRC}/doc/${PORTNAME}.png \
${STAGEDIR}${PREFIX}/share/pixmaps
+do-install-DOCS-on:
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
do-install-NLS-on:
-.for lang in cs de es fr gl hu it ja nl pl pt pt_BR ru sk sv tl tr zh_CN zh_TW
+.for lang in cs de es fr gl hu it ja kab nl pl pt pt_BR ru sk sv tl tr zh_CN zh_TW
@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/mtpaint.mo
Index: head/graphics/mtpaint/distinfo
===================================================================
--- head/graphics/mtpaint/distinfo
+++ head/graphics/mtpaint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mtpaint-3.40.tar.bz2) = ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890
-SIZE (mtpaint-3.40.tar.bz2) = 600857
+TIMESTAMP = 1611508400
+SHA256 (wjaguar-mtPaint-3.50.03-40bde45_GH0.tar.gz) = ee38e0023a4c431390de5ec0ec93d8e5c16792b6143cd563ea11186d9ca60550
+SIZE (wjaguar-mtPaint-3.50.03-40bde45_GH0.tar.gz) = 1189924
Index: head/graphics/mtpaint/files/patch-configure
===================================================================
--- head/graphics/mtpaint/files/patch-configure
+++ head/graphics/mtpaint/files/patch-configure
@@ -1,14 +1,14 @@
---- configure.bak 2011-12-30 03:08:17.000000000 +0900
-+++ configure 2012-01-06 05:25:11.000000000 +0900
-@@ -68,6 +68,7 @@
- "tiff" ) NTIFF=YES;;
- "notiff" ) NTIFF=NO;;
- "statictiff" ) STATIC_TIFF=TIFF;;
+--- configure.orig 2021-01-23 07:22:40 UTC
++++ configure
+@@ -74,6 +74,7 @@ do
+ "webp" ) NWEBP=YES;;
+ "nowebp" ) NWEBP=NO;;
+ "staticwebp" ) STATIC_WEBP=WebP;;
+ "ft" ) NFT=YES;;
"noft" ) NFT=NO;;
"staticft" ) STATIC_FT=FreeType;;
"lcms" ) NCMS=LittleCMS;;
-@@ -471,7 +472,7 @@
+@@ -523,7 +524,7 @@ else # $OPTS = CFLAGS
MARCH=
# And leave CFLAGS alone
fi
@@ -17,3 +17,12 @@
# Set Windows-specific flags
if [ "$OS" != "${OS#MinGW/}" ]
then
+@@ -856,7 +857,7 @@ General
+ -------
+
+ Version $MT_V
+- System $OS
++ System $OSTYPE
+ Toolkit GTK+$GTK${GTK2VERSION:+.$GTK2VERSION}
+ Lists GTK+$MT_LISTS
+ File Picker $MT_FPICK
Index: head/graphics/mtpaint/files/patch-src_png.c
===================================================================
--- head/graphics/mtpaint/files/patch-src_png.c
+++ head/graphics/mtpaint/files/patch-src_png.c
@@ -1,92 +0,0 @@
---- src/png.c.orig 2011-10-27 20:56:24 UTC
-+++ src/png.c
-@@ -1510,7 +1510,11 @@ static int load_gif_frames(char *file_na
- int res, val, disposal, bpp, cmask, lastzero = FALSE;
-
-
-+#if GIFLIB_MAJOR >= 5
-+ if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
-+#else
- if (!(giffy = DGifOpenFileName(file_name))) return (-1);
-+#endif
-
- /* Init state structure */
- memset(&stat, 0, sizeof(stat));
-@@ -1608,7 +1612,11 @@ static int load_gif_frames(char *file_na
- }
- res = 1;
- fail: mem_free_chanlist(w_set.img);
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+ DGifCloseFile(giffy, NULL);
-+#else
- DGifCloseFile(giffy);
-+#endif
- return (res);
- }
-
-@@ -1621,7 +1629,11 @@ static int load_gif(char *file_name, ls_
- int delay = settings->gif_delay, trans = -1;//, disposal = 0;
-
-
-+#if GIFLIB_MAJOR >= 5
-+ if (!(giffy = DGifOpenFileName(file_name, NULL))) return (-1);
-+#else
- if (!(giffy = DGifOpenFileName(file_name))) return (-1);
-+#endif
-
- /* Get global palette */
- settings->colors = convert_gif_palette(settings->pal, giffy->SColorMap);
-@@ -1659,7 +1671,11 @@ static int load_gif(char *file_name, ls_
- }
- }
- res = 1;
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+fail: DGifCloseFile(giffy, NULL);
-+#else
- fail: DGifCloseFile(giffy);
-+#endif
- return (res);
- }
-
-@@ -1682,10 +1698,18 @@ static int save_gif(char *file_name, ls_
- nc |= nc >> 1; nc |= nc >> 2; nc |= nc >> 4;
- nc += !nc + 1; // No less than 2 colors
-
-+#if GIFLIB_MAJOR >= 5
-+ gif_map = GifMakeMapObject(nc, NULL);
-+#else
- gif_map = MakeMapObject(nc, NULL);
-+#endif
- if (!gif_map) return -1;
-
-+#if GIFLIB_MAJOR >= 5
-+ giffy = EGifOpenFileName(file_name, FALSE, NULL);
-+#else
- giffy = EGifOpenFileName(file_name, FALSE);
-+#endif
- if (!giffy) goto fail0;
-
- for (i = 0; i < settings->colors; i++)
-@@ -1725,14 +1749,22 @@ static int save_gif(char *file_name, ls_
- if (!settings->silent) progress_end();
- msg = 0;
-
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+fail: EGifCloseFile(giffy, NULL);
-+#else
- fail: EGifCloseFile(giffy);
-+#endif
- #ifndef WIN32
- /* giflib creates files with 0600 permissions, which is nasty - WJ */
- mode = umask(0022);
- umask(mode);
- chmod(file_name, 0666 & ~mode);
- #endif
-+#if GIFLIB_MAJOR >= 5
-+fail0: GifFreeMapObject(gif_map);
-+#else
- fail0: FreeMapObject(gif_map);
-+#endif
-
- return (msg);
- }
Index: head/graphics/mtpaint/pkg-plist
===================================================================
--- head/graphics/mtpaint/pkg-plist
+++ head/graphics/mtpaint/pkg-plist
@@ -10,6 +10,7 @@
%%NLS%%share/locale/it/LC_MESSAGES/mtpaint.mo
%%NLS%%share/locale/ja/LC_MESSAGES/mtpaint.mo
%%NLS%%share/locale/nl/LC_MESSAGES/mtpaint.mo
+%%NLS%%share/locale/kab/LC_MESSAGES/mtpaint.mo
%%NLS%%share/locale/pl/LC_MESSAGES/mtpaint.mo
%%NLS%%share/locale/pt/LC_MESSAGES/mtpaint.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/mtpaint.mo

File Metadata

Mime Type
text/plain
Expires
Tue, Jun 23, 7:59 PM (14 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34257732
Default Alt Text
D28336.diff (7 KB)

Event Timeline