Date: Thu, 27 Mar 2014 03:30:03 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/187968: x11-toolkits/xmhtml: Update to version 1.1.9 Message-ID: <20140327033003.df48d11d044337df6c6f6588@yahoo.com> Resent-Message-ID: <201403261840.s2QIe0gV011362@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187968
>Category: ports
>Synopsis: x11-toolkits/xmhtml: Update to version 1.1.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 26 18:40:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p7 i386
>Organization:
>Environment:
>Description:
- Update to version 1.1.9
Remove file:
files/patch-lib_common_readPNG.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-toolkits/xmhtml/Makefile x11-toolkits/xmhtml/Makefile
--- /usr/ports/x11-toolkits/xmhtml/Makefile 2014-03-11 15:26:48.000000000 +0900
+++ x11-toolkits/xmhtml/Makefile 2014-03-27 00:00:00.000000000 +0900
@@ -2,7 +2,7 @@
# $FreeBSD: head/x11-toolkits/xmhtml/Makefile 347838 2014-03-11 02:44:55Z miwi $
PORTNAME= XmHTML
-PORTVERSION= 1.1.8
+PORTVERSION= 1.1.9
CATEGORIES= x11-toolkits www
MASTER_SITES= SF/${PORTNAME:L}
EXTRACT_SUFX= .tgz
@@ -27,10 +27,14 @@
(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
${STAGEDIR}${PREFIX}/include/XmHTML)
@${MKDIR} ${STAGEDIR}${DOCSDIR}
- @(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ @(cd ${WRKSRC}/html && ${FIND} . ! -name "*Makefile*" | \
+ ${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
+ ${STAGEDIR}${DOCSDIR})
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
.for i in book contrib examples
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${EXAMPLESDIR})
+ @(cd ${WRKSRC} && ${FIND} ${i} ! -name "*Makefile*" | \
+ ${CPIO} --quiet -dump -R ${SHAREOWN}:${SHAREGRP} \
+ ${STAGEDIR}${EXAMPLESDIR})
.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/x11-toolkits/xmhtml/distinfo x11-toolkits/xmhtml/distinfo
--- /usr/ports/x11-toolkits/xmhtml/distinfo 2014-03-11 15:27:05.000000000 +0900
+++ x11-toolkits/xmhtml/distinfo 2014-03-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (XmHTML-1.1.8.tgz) = 5cce9b961c15bd5eac030a8edab55b62298367b2f33b5c5bdc3a1dbbf06efcd5
-SIZE (XmHTML-1.1.8.tgz) = 1327485
+SHA256 (XmHTML-1.1.9.tgz) = 264da26421a612e4cb05a75d874785b843afe2ce7598260ec19cedeb32628da2
+SIZE (XmHTML-1.1.9.tgz) = 1349743
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-Makefile x11-toolkits/xmhtml/files/patch-Makefile
--- /usr/ports/x11-toolkits/xmhtml/files/patch-Makefile 2014-03-11 15:27:05.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-Makefile 2014-03-27 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
--- Makefile.orig
+++ Makefile
-@@ -43,7 +43,7 @@
+@@ -46,7 +46,7 @@
# remove the examples directory from this line.
# If you want to build the XmHTML tutorial examples, add the book directory.
@@ -9,7 +9,7 @@
# some common definitions
#
-@@ -58,7 +58,7 @@
+@@ -61,7 +61,7 @@
RANLIB= ranlib
SHELL = /bin/sh
@@ -18,20 +18,20 @@
# change this to makedepend if your system doesn't have gcc
MAKEDEPEND= gccmakedep
-@@ -67,9 +67,9 @@
+@@ -70,9 +70,9 @@
# Compiler Settings #
# #
#####################
-CC = gcc
--CFLAGS = -g -funroll-loops -Wall -pipe -ansi
+-CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS)
-LDFLAGS =
+#CC = gcc
-+#CFLAGS = -g -funroll-loops -Wall -pipe -ansi
-+#LDFLAGS =
++#CFLAGS = -g -funroll-loops -Wall -pipe -ansi $(EXTRA_CFLAGS)
++#LDFLAGS =
# The following flags are *very* usefull if you are getting unresolved
# references to functions in libraries that you *know* to exist.
-@@ -122,7 +122,7 @@
+@@ -125,7 +125,7 @@
# HAVE_LIBZ => zlib.h
ZLIBINC =
@@ -40,7 +40,7 @@
# Image libraries
# No need to add -lXpm if you need to include it with LIBS below
-@@ -133,7 +133,7 @@
+@@ -136,7 +136,7 @@
# HAVE_LIBZ => libz (and possibly libm)
ZLIBLIB = -lz -lm
@@ -49,7 +49,7 @@
# It might be troublesome to know what the correct defines are for your
# system. A possible set of defines for some OS's is given below. Pick
-@@ -173,7 +173,7 @@
+@@ -176,7 +176,7 @@
# Add -DDEBUG to enable selective debug output (see the file DEBUGGING for more
# info).
#
@@ -58,7 +58,7 @@
$(EXTRA_CPPFLAGS) \
$(IMAGEDEFINES) \
$(XFT_DEFINES)
-@@ -183,7 +183,7 @@
+@@ -186,7 +186,7 @@
# Platform specific includes
ifeq ($(PLATFORM),Motif)
@@ -67,7 +67,7 @@
else
ifeq ($(PLATFORM),gtk)
PLATFORMINC=\
-@@ -206,7 +206,7 @@
+@@ -209,7 +209,7 @@
# Motif version (default)
ifeq ($(PLATFORM),Motif)
diff -urN /usr/ports/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c
--- /usr/ports/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c 2014-03-11 15:26:48.000000000 +0900
+++ x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c 1970-01-01 09:00:00.000000000 +0900
@@ -1,149 +0,0 @@
---- lib/common/readPNG.c.orig 1998-11-16 23:56:19.000000000 +0100
-+++ lib/common/readPNG.c 2012-05-26 14:16:45.000000000 +0200
-@@ -184,9 +184,11 @@
- int i, idx, npass;
- int width, height, color_type;
- int ncolors, max_colors;
-- float gamma, fg_gamma;
-+ float gamma;
-+ double fg_gamma;
- Boolean has_alpha = False, has_cmap = False, do_gamma = True;
- png_bytep *row_ptrs;
-+ png_colorp palette;
- char msg[128];
- static XmHTMLRawImageData *img_data;
-
-@@ -265,17 +267,18 @@
- ResetRawImage(img_data);
-
- /* save width & height */
-- width = img_data->width = info_ptr->width;
-- height = img_data->height = info_ptr->height;
-+ width = img_data->width = png_get_image_width(png_ptr, info_ptr);
-+ height = img_data->height = png_get_image_height(png_ptr, info_ptr);
-
- /* image depth */
-- ib->depth = info_ptr->bit_depth;
-+ ib->depth = png_get_bit_depth(png_ptr, info_ptr);
-
- /* no of colors */
-- ncolors = img_data->cmapsize = info_ptr->num_palette;
-+ png_get_PLTE(png_ptr, info_ptr, &palette, &ncolors);
-+ img_data->cmapsize = ncolors;
-
- /* type of image */
-- color_type = info_ptr->color_type;
-+ color_type = png_get_color_type(png_ptr, info_ptr);
-
- /*
- * The fun stuff. This is based on readPNG by Greg Roelofs as found
-@@ -306,7 +309,7 @@
- * Actual image creation is postponed until the image is
- * needed.
- */
-- if(info_ptr->valid & PNG_INFO_tRNS)
-+ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- {
- _XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
- png_set_expand(png_ptr);
-@@ -319,9 +322,9 @@
- AllocRawImageCmap(img_data, ncolors);
- for(i = 0; i < ncolors; i++)
- {
-- GETR(img_data->cmap[i]) = info_ptr->palette[i].red;
-- GETG(img_data->cmap[i]) = info_ptr->palette[i].green;
-- GETB(img_data->cmap[i]) = info_ptr->palette[i].blue;
-+ GETR(img_data->cmap[i]) = palette[i].red;
-+ GETG(img_data->cmap[i]) = palette[i].green;
-+ GETB(img_data->cmap[i]) = palette[i].blue;
- }
- has_cmap = True;
- data = (Byte*)malloc(width*height*sizeof(Byte));
-@@ -355,7 +358,7 @@
- * grayscale with transparency is expanded to RGB with alpha
- * channel.
- */
-- if(info_ptr->valid & PNG_INFO_tRNS)
-+ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
- {
- _XmHTMLDebug(15, ("readPNG.c: tRNS chunk present\n"));
- png_set_gray_to_rgb(png_ptr);
-@@ -434,7 +437,7 @@
- break;
- default:
- sprintf(msg, "bad PNG image: unknown color type (%d)",
-- info_ptr->color_type);
-+ png_get_color_type(png_ptr, info_ptr));
- my_png_error(png_ptr, msg);
- break;
- }
-@@ -444,16 +447,18 @@
- * Doing that for alpha channel images would change the colortype of the
- * current image, leading to weird results.
- */
-- if(!has_alpha && info_ptr->valid & PNG_INFO_bKGD)
-+ if(!has_alpha && png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD))
- {
-- png_set_background(png_ptr, &(info_ptr->background),
-+ png_color_16p background;
-+ png_get_bKGD(png_ptr, info_ptr, &background);
-+ png_set_background(png_ptr, background,
- PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-- img_data->bg = info_ptr->background.index;
-+ img_data->bg = background->index;
- }
-
- /* handle gamma correction */
-- if(info_ptr->valid & PNG_INFO_gAMA)
-- fg_gamma = info_ptr->gamma;
-+ if(png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA))
-+ png_get_gAMA(png_ptr, info_ptr, &fg_gamma);
- else
- fg_gamma = 0.45;
-
-@@ -464,20 +469,20 @@
- /* dithering gets handled by caller */
-
- /* one byte per pixel */
-- if(info_ptr->bit_depth < 8)
-+ if(png_get_bit_depth(png_ptr, info_ptr) < 8)
- png_set_packing(png_ptr);
-
- /* no tRNS chunk handling, we've expanded it to an alpha channel. */
-
- /* handle interlacing */
-- if(info_ptr->interlace_type)
-+ if(png_get_interlace_type(png_ptr, info_ptr))
- npass = png_set_interlace_handling(png_ptr);
-
- /* and now update everything */
- png_read_update_info(png_ptr, info_ptr);
-
- /* has possibly changed if we have promoted GrayScale or tRNS chunks */
-- color_type = info_ptr->color_type;
-+ color_type = png_get_color_type(png_ptr, info_ptr);
-
- /* new color_type? */
- if(color_type == PNG_COLOR_TYPE_RGB_ALPHA)
-@@ -497,10 +502,10 @@
- * will call doAlphaChannel to do the actual image creation.
- */
- row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
-- png_data = (png_bytep)malloc(height*info_ptr->rowbytes);
-+ png_data = (png_bytep)malloc(height*png_get_rowbytes(png_ptr, info_ptr));
-
- for(i = 0; i < height; i++)
-- row_ptrs[i] = (png_bytep)png_data + i*info_ptr->rowbytes;
-+ row_ptrs[i] = (png_bytep)png_data + i*png_get_rowbytes(png_ptr, info_ptr);
-
- /* read it */
- png_read_image(png_ptr, row_ptrs);
-@@ -529,7 +534,7 @@
- row_ptrs = (png_bytep*)malloc(height*sizeof(png_bytep));
-
- for(i = 0; i < height; ++i)
-- row_ptrs[i] = (png_bytep)data + i*info_ptr->rowbytes;
-+ row_ptrs[i] = (png_bytep)data + i*png_get_rowbytes(png_ptr, info_ptr);
-
- /* read it */
- png_read_image(png_ptr, row_ptrs);
diff -urN /usr/ports/x11-toolkits/xmhtml/pkg-plist x11-toolkits/xmhtml/pkg-plist
--- /usr/ports/x11-toolkits/xmhtml/pkg-plist 2014-01-23 03:14:17.000000000 +0900
+++ x11-toolkits/xmhtml/pkg-plist 2014-03-27 00:00:00.000000000 +0900
@@ -83,9 +83,6 @@
%%PORTDOCS%%%%DOCSDIR%%/structures.html
%%PORTDOCS%%%%DOCSDIR%%/xmhtml_prog.html
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/Imakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/Makefile.org
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/Makefile.orig
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/autosize_html.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/forced_html.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/html.c
@@ -93,8 +90,6 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/simple_html.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/simple_html2.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/book/work_window.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/Makefile.org
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/VUEorDT.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/drawBttn.c
@@ -106,9 +101,6 @@
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/swallow2.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/HTMLDemos.ad
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Imakefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Makefile.org
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/Makefile.orig
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/README
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/cache.c
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/examples/cache.h
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140327033003.df48d11d044337df6c6f6588>