From nobody@FreeBSD.org  Thu Aug 25 09:25:32 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC8FB106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Aug 2011 09:25:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 933528FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Aug 2011 09:25:32 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7P9PWLO040975
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 25 Aug 2011 09:25:32 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p7P9PWfO040974;
	Thu, 25 Aug 2011 09:25:32 GMT
	(envelope-from nobody)
Message-Id: <201108250925.p7P9PWfO040974@red.freebsd.org>
Date: Thu, 25 Aug 2011 09:25:32 GMT
From: Aldis Berjoza <aldis@bsdroot.lv>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Update and fix www/xxxterm
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         160180
>Category:       ports
>Synopsis:       [PATCH] Update and fix www/xxxterm
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    zi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 25 09:30:11 UTC 2011
>Closed-Date:    Tue Sep 06 10:18:05 UTC 2011
>Last-Modified:  Tue Sep 06 10:18:05 UTC 2011
>Originator:     Aldis Berjoza
>Release:        
>Organization:
>Environment:
>Description:
Update www/xxxterm to v1.500
Fix build with patch
Add SourceForege to mastersites
Update WWW in pkg-descr
Make port also install style.css
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN xxxterm.bak/Makefile xxxterm/Makefile
--- xxxterm.bak/Makefile	2011-08-25 02:24:24.959127474 +0300
+++ xxxterm/Makefile	2011-08-25 12:17:35.344734836 +0300
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	xxxterm
-PORTVERSION=	1.425
-PORTREVISION=	1
+PORTVERSION=	1.500
 CATEGORIES=	www
-MASTER_SITES=	http://opensource.conformal.com/snapshots/xxxterm/
+MASTER_SITES=	http://opensource.conformal.com/snapshots/xxxterm/ \
+		SF/xxxterm/
+
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	aldis@bsdroot.lv
@@ -37,6 +38,7 @@
 .for i in ${ICONS}
 PLIST_FILES+=	share/xxxterm/xxxtermicon${i}.png
 .endfor
+PLIST_FILES+=	share/xxxterm/style.css
 
 do-build:
 	(cd ${WRKSRC}/freebsd && make)
@@ -48,6 +50,7 @@
 .for i in ${ICONS}
 	${INSTALL_DATA}  ${WRKSRC}/xxxtermicon${i}.png ${PREFIX}/share/xxxterm/
 .endfor
+	${INSTALL_DATA}  ${WRKSRC}/style.css ${PREFIX}/share/xxxterm/
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/favorites ${EXAMPLESDIR}/
diff -ruN xxxterm.bak/distinfo xxxterm/distinfo
--- xxxterm.bak/distinfo	2011-08-25 02:24:24.959127474 +0300
+++ xxxterm/distinfo	2011-08-25 12:10:17.116208548 +0300
@@ -1,2 +1,2 @@
-SHA256 (xxxterm-1.425.tgz) = 07aeb9a93c0f46e2022bbbff2c62a68e0937a0ffd4a358f0121551ae84bbd72b
-SIZE (xxxterm-1.425.tgz) = 150138
+SHA256 (xxxterm-1.500.tgz) = 83089772ac23201bda039a6f0de0546e86b96578637e5eafbb9a50e8044c6665
+SIZE (xxxterm-1.500.tgz) = 157127
diff -ruN xxxterm.bak/files/patch-freebsd__Makefile xxxterm/files/patch-freebsd__Makefile
--- xxxterm.bak/files/patch-freebsd__Makefile	1970-01-01 03:00:00.000000000 +0300
+++ xxxterm/files/patch-freebsd__Makefile	2011-08-25 12:11:40.788702570 +0300
@@ -0,0 +1,10 @@
+--- ./freebsd/Makefile.orig	2011-08-25 12:11:28.177423700 +0300
++++ ./freebsd/Makefile	2011-08-25 12:11:33.908010890 +0300
+@@ -1,6 +1,6 @@
+ # $xxxterm: Makefile,v 1.8 2011/04/21 13:02:54 marco Exp $
+ 
+-LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4
++LIBS= gtk+-2.0 webkit-1.0 libsoup-2.4 gnutls
+ 
+ LDADD= -lutil
+ GTK_CFLAGS!= pkg-config --cflags $(LIBS)
diff -ruN xxxterm.bak/pkg-descr xxxterm/pkg-descr
--- xxxterm.bak/pkg-descr	2011-08-25 02:24:24.959127474 +0300
+++ xxxterm/pkg-descr	2011-08-25 12:19:46.958133078 +0300
@@ -2,4 +2,4 @@
 keyboard users while maintaining traditional web browser behaviour. It is ISC
 licensed. It is based on webkit using GTK+. 
 
-WWW: http://opensource.conformal.com/wiki/XXXTerm
+WWW: https://opensource.conformal.com/wiki/XXXTerm


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->zi 
Responsible-Changed-By: zi 
Responsible-Changed-When: Thu Aug 25 11:36:22 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160180 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue Sep 6 10:17:58 UTC 2011 
State-Changed-Why:  
ports/160292 committed instead 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160180 
>Unformatted:
