From owner-svn-ports-all@FreeBSD.ORG Sat Apr 26 02:28:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6EB1BD3; Sat, 26 Apr 2014 02:28:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C73E51599; Sat, 26 Apr 2014 02:28:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3Q2SJJn078981; Sat, 26 Apr 2014 02:28:19 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3Q2SJXP078974; Sat, 26 Apr 2014 02:28:19 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201404260228.s3Q2SJXP078974@svn.freebsd.org> From: Martin Wilke Date: Sat, 26 Apr 2014 02:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352211 - in head/x11-toolkits/xmhtml: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Apr 2014 02:28:20 -0000 Author: miwi Date: Sat Apr 26 02:28:18 2014 New Revision: 352211 URL: http://svnweb.freebsd.org/changeset/ports/352211 QAT: https://qat.redports.org/buildarchive/r352211/ Log: - Update to version 1.1.9 PR: 187968 Submitted by: Ports Fury Deleted: head/x11-toolkits/xmhtml/files/patch-lib_common_readPNG.c Modified: head/x11-toolkits/xmhtml/Makefile head/x11-toolkits/xmhtml/distinfo head/x11-toolkits/xmhtml/files/patch-Makefile head/x11-toolkits/xmhtml/pkg-plist Modified: head/x11-toolkits/xmhtml/Makefile ============================================================================== --- head/x11-toolkits/xmhtml/Makefile Sat Apr 26 02:27:25 2014 (r352210) +++ head/x11-toolkits/xmhtml/Makefile Sat Apr 26 02:28:18 2014 (r352211) @@ -2,7 +2,7 @@ # $FreeBSD$ 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 @@ do-install: (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 Modified: head/x11-toolkits/xmhtml/distinfo ============================================================================== --- head/x11-toolkits/xmhtml/distinfo Sat Apr 26 02:27:25 2014 (r352210) +++ head/x11-toolkits/xmhtml/distinfo Sat Apr 26 02:28:18 2014 (r352211) @@ -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 Modified: head/x11-toolkits/xmhtml/files/patch-Makefile ============================================================================== --- head/x11-toolkits/xmhtml/files/patch-Makefile Sat Apr 26 02:27:25 2014 (r352210) +++ head/x11-toolkits/xmhtml/files/patch-Makefile Sat Apr 26 02:28:18 2014 (r352211) @@ -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) Modified: head/x11-toolkits/xmhtml/pkg-plist ============================================================================== --- head/x11-toolkits/xmhtml/pkg-plist Sat Apr 26 02:27:25 2014 (r352210) +++ head/x11-toolkits/xmhtml/pkg-plist Sat Apr 26 02:28:18 2014 (r352211) @@ -83,9 +83,6 @@ lib/libXmHTML.so.1 %%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 @@ lib/libXmHTML.so.1 %%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 @@ lib/libXmHTML.so.1 %%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