From tkato432@yahoo.com  Sat Jun 15 18:01:41 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 053CA8EF
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 18:01:39 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165])
	by mx1.freebsd.org (Postfix) with ESMTP id A456D11F2
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 15 Jun 2013 18:01:38 +0000 (UTC)
Received: from localhost.localdomain (ZT030083.ppp.dion.ne.jp [59.128.30.83])
	by msa102lp.auone-net.jp (au one net msa) with ESMTP id A69284AC036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 16 Jun 2013 03:01:35 +0900 (JST)
Message-Id: <20130616025605.cc289a65765ea451aa275c3d@yahoo.com>
Date: Sun, 16 Jun 2013 02:56:05 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/pqiv: Update MASTER_SITES

>Number:         179590
>Category:       ports
>Synopsis:       graphics/pqiv: Update MASTER_SITES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 15 18:10:04 UTC 2013
>Closed-Date:    Mon Jun 17 15:24:21 UTC 2013
>Last-Modified:  Mon Jun 17 15:30:01 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update MASTER_SITES
- Fix runtime error against recent glib2

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/pqiv/Makefile graphics/pqiv/Makefile
--- /usr/ports/graphics/pqiv/Makefile	2012-11-08 09:46:06.000000000 +0900
+++ graphics/pqiv/Makefile	2013-06-16 00:00:00.000000000 +0900
@@ -1,14 +1,11 @@
-# New ports collection makefile for:	graphics/pqiv
-# Date created:				March 28 2008
-# Whom:					Martin Tournoij <carpetsmoker@xs4all.nl>
-#
+# Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
 # $FreeBSD: head/graphics/pqiv/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 PORTNAME=	pqiv
 PORTVERSION=	0.12
+PORTREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/
+MASTER_SITES=	GHC
 EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -25,6 +22,11 @@
 CONFIG_DESC=	Enable support for a configuration file
 ANIMATIONS_DESC=Enable support for animations
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	phillipberndt
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_CSTD=	gnu89
diff -urN /usr/ports/graphics/pqiv/files/patch-pqiv.c graphics/pqiv/files/patch-pqiv.c
--- /usr/ports/graphics/pqiv/files/patch-pqiv.c	2012-11-08 09:46:06.000000000 +0900
+++ graphics/pqiv/files/patch-pqiv.c	2013-06-16 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
 --- pqiv.c.orig	2009-10-08 19:49:20.000000000 +0900
 +++ pqiv.c	2009-10-10 17:43:14.000000000 +0900
-@@ -273,7 +273,7 @@
+@@ -288,7 +288,7 @@
                  #ifndef NO_COMMANDS
                  " -<n> s         Set command number n (1-9) to s \n"
                  "                See manpage for advanced commands (starting with > or |) \n"
@@ -9,7 +9,7 @@
                  #endif
  
                  "\n"
-@@ -297,7 +297,7 @@
+@@ -312,7 +312,7 @@
                  " v              Vertical flip \n"
                  " i              Show/hide info box \n"
                  " s              Slideshow toggle \n"
@@ -18,7 +18,7 @@
                  #ifndef NO_COMMANDS
                  " <n>            Run command n (1-3) \n"
                  #endif
-@@ -1737,12 +1737,12 @@
+@@ -1955,12 +1955,12 @@
  			}
  			break;
  			/* }}} */
@@ -35,7 +35,16 @@
  			if(link(currentFile->fileName, buf) != 0) {
  				/* Failed to link image, try copying it */
  				if(copyFile(currentFile->fileName, buf) != TRUE) {
-@@ -2214,13 +2214,13 @@
+@@ -2252,8 +2252,6 @@
+ /* glib & threads initialization {{{ */
+ 	DEBUG1("Debug mode enabled");
+ 	g_type_init();
+-	g_thread_init(NULL);
+-	gdk_threads_init();
+ 	if(gtk_init_check(&argc, &argv) == FALSE) {
+ 		die("Failed to open X11 display.");
+ 	}
+@@ -2436,13 +2434,13 @@
  				}
  				optionCommands[i] = g_strdup((gchar*)optarg);
  				break;
diff -urN /usr/ports/graphics/pqiv/pkg-descr graphics/pqiv/pkg-descr
--- /usr/ports/graphics/pqiv/pkg-descr	2012-11-08 09:46:06.000000000 +0900
+++ graphics/pqiv/pkg-descr	2013-06-16 00:00:00.000000000 +0900
@@ -1,13 +1,7 @@
-qiv (graphics/qiv) is a great image viewer, but it does not use gtk2
-but imlib for image handling. This is bad, because many distributions
-(well, at least gentoo) do not offer this library anymore as it's
-quite old and not maintained anymore.
-
-When the first release of pqiv was written, I used python, hence the
-name. I expected somebody else to write a c-rewrite of qiv, so I
-didn't really care about that. About one month later nothing had
-happened yet, so I did this on my own. Starting from 0.4 pqiv means
-"pretty quick image viewer", written in pure C, using gtk+-2.0.
+Originally, PQIV was written as a drop-in replacement for QIV. The first
+release was not more than a Python script, hence the name. Now, PQIV is
+a (modulo some small extras) full featured clone of QIV written in C
+using GTK-2 and GLIB-2.
 
 Features include:
 * Fullscreen
@@ -17,7 +11,8 @@
 * Move by drag & drop in fullscreen
 * Keep preferences in a configuration file
 * Rather small executable (~36k), low ram consumtion, quick
-* Execute predefined commands, pipe images through them or display their output
+* Execute predefined commands, pipe images through them or display
+  their output
 * Real transparency
 * Fade between images
 
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jun 15 18:11:15 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179590 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Jun 17 15:24:21 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=179590 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/179590: commit references a PR
Date: Mon, 17 Jun 2013 15:24:25 +0000 (UTC)

 Author: miwi
 Date: Mon Jun 17 15:24:17 2013
 New Revision: 321130
 URL: http://svnweb.freebsd.org/changeset/ports/321130
 
 Log:
   - Update MASTER_SITES
   - Fix runtime error against recent glib2
   
   PR:		179590
   Submitted by:	Ports Fury
 
 Modified:
   head/graphics/pqiv/Makefile   (contents, props changed)
   head/graphics/pqiv/files/patch-pqiv.c   (contents, props changed)
   head/graphics/pqiv/pkg-descr   (contents, props changed)
 
 Modified: head/graphics/pqiv/Makefile
 ==============================================================================
 --- head/graphics/pqiv/Makefile	Mon Jun 17 15:22:24 2013	(r321129)
 +++ head/graphics/pqiv/Makefile	Mon Jun 17 15:24:17 2013	(r321130)
 @@ -1,14 +1,11 @@
 -# New ports collection makefile for:	graphics/pqiv
 -# Date created:				March 28 2008
 -# Whom:					Martin Tournoij <carpetsmoker@xs4all.nl>
 -#
 +# Created by: Martin Tournoij <carpetsmoker@xs4all.nl>
  # $FreeBSD$
 -#
  
  PORTNAME=	pqiv
  PORTVERSION=	0.12
 +PORTREVISION=	1
  CATEGORIES=	graphics
 -MASTER_SITES=	http://www.pberndt.com/raw/Programme/Linux/pqiv/_download/
 +MASTER_SITES=	GHC
  EXTRACT_SUFX=	.tbz
  
  MAINTAINER=	ports@FreeBSD.org
 @@ -25,6 +22,11 @@ COMMANDS_DESC=	Enable support for extern
  CONFIG_DESC=	Enable support for a configuration file
  ANIMATIONS_DESC=Enable support for animations
  
 +USE_GITHUB=	yes
 +GH_ACCOUNT=	phillipberndt
 +
 +WRKSRC=		${WRKDIR}/${DISTNAME}
 +
  USE_BZIP2=	yes
  USE_GNOME=	gtk20
  USE_CSTD=	gnu89
 
 Modified: head/graphics/pqiv/files/patch-pqiv.c
 ==============================================================================
 --- head/graphics/pqiv/files/patch-pqiv.c	Mon Jun 17 15:22:24 2013	(r321129)
 +++ head/graphics/pqiv/files/patch-pqiv.c	Mon Jun 17 15:24:17 2013	(r321130)
 @@ -1,6 +1,6 @@
  --- pqiv.c.orig	2009-10-08 19:49:20.000000000 +0900
  +++ pqiv.c	2009-10-10 17:43:14.000000000 +0900
 -@@ -273,7 +273,7 @@
 +@@ -288,7 +288,7 @@
                   #ifndef NO_COMMANDS
                   " -<n> s         Set command number n (1-9) to s \n"
                   "                See manpage for advanced commands (starting with > or |) \n"
 @@ -9,7 +9,7 @@
                   #endif
   
                   "\n"
 -@@ -297,7 +297,7 @@
 +@@ -312,7 +312,7 @@
                   " v              Vertical flip \n"
                   " i              Show/hide info box \n"
                   " s              Slideshow toggle \n"
 @@ -18,7 +18,7 @@
                   #ifndef NO_COMMANDS
                   " <n>            Run command n (1-3) \n"
                   #endif
 -@@ -1737,12 +1737,12 @@
 +@@ -1955,12 +1955,12 @@
   			}
   			break;
   			/* }}} */
 @@ -35,7 +35,16 @@
   			if(link(currentFile->fileName, buf) != 0) {
   				/* Failed to link image, try copying it */
   				if(copyFile(currentFile->fileName, buf) != TRUE) {
 -@@ -2214,13 +2214,13 @@
 +@@ -2252,8 +2252,6 @@
 + /* glib & threads initialization {{{ */
 + 	DEBUG1("Debug mode enabled");
 + 	g_type_init();
 +-	g_thread_init(NULL);
 +-	gdk_threads_init();
 + 	if(gtk_init_check(&argc, &argv) == FALSE) {
 + 		die("Failed to open X11 display.");
 + 	}
 +@@ -2436,13 +2434,13 @@
   				}
   				optionCommands[i] = g_strdup((gchar*)optarg);
   				break;
 
 Modified: head/graphics/pqiv/pkg-descr
 ==============================================================================
 --- head/graphics/pqiv/pkg-descr	Mon Jun 17 15:22:24 2013	(r321129)
 +++ head/graphics/pqiv/pkg-descr	Mon Jun 17 15:24:17 2013	(r321130)
 @@ -1,13 +1,7 @@
 -qiv (graphics/qiv) is a great image viewer, but it does not use gtk2
 -but imlib for image handling. This is bad, because many distributions
 -(well, at least gentoo) do not offer this library anymore as it's
 -quite old and not maintained anymore.
 -
 -When the first release of pqiv was written, I used python, hence the
 -name. I expected somebody else to write a c-rewrite of qiv, so I
 -didn't really care about that. About one month later nothing had
 -happened yet, so I did this on my own. Starting from 0.4 pqiv means
 -"pretty quick image viewer", written in pure C, using gtk+-2.0.
 +Originally, PQIV was written as a drop-in replacement for QIV. The first
 +release was not more than a Python script, hence the name. Now, PQIV is
 +a (modulo some small extras) full featured clone of QIV written in C
 +using GTK-2 and GLIB-2.
  
  Features include:
  * Fullscreen
 @@ -17,7 +11,8 @@ Features include:
  * Move by drag & drop in fullscreen
  * Keep preferences in a configuration file
  * Rather small executable (~36k), low ram consumtion, quick
 -* Execute predefined commands, pipe images through them or display their output
 +* Execute predefined commands, pipe images through them or display
 +  their output
  * Real transparency
  * Fade between images
  
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
