ports/58035: [maintainer update] graphics/gthumb2 to 2.1.7

[Pav Lucistnik]

>Number:         58035
>Category:       ports
>Synopsis:       [maintainer update] graphics/gthumb2 to 2.1.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 14 15:30:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Pav Lucistnik
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD hood.oook.cz 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Thu Oct 9 01:51:12 CEST 2003 root at hood.oook.cz:/usr/obj/usr/src/sys/PAV i386


	
>Description:
update graphics/gthumb2 to 2.1.7

- patch around a GNUism in sed (breaks gthumb on BSDs, Solaris, IRIX
  and probably more)
- add conflicts with gthumb1. committer please add

CONFLICTS=	gthumb2-*

to graphics/gthumb/Makefile

Committer note: cvs add files/patch-add-include-prefix

>How-To-Repeat:
	
>Fix:

diff -ruN /usr/ports/graphics/gthumb2/Makefile gthumb2/Makefile
--- /usr/ports/graphics/gthumb2/Makefile	Tue Sep 30 22:37:17 2003
+++ gthumb2/Makefile	Tue Oct 14 22:59:12 2003
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gthumb2
-PORTVERSION=	2.1.6
-PORTREVISION=	1
+PORTVERSION=	2.1.7
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.1
@@ -16,6 +15,8 @@
 
 MAINTAINER=	pav at oook.cz
 COMMENT=	An image viewer and browser for the GNOME 2 environment
+
+CONFLICTS=	gthumb-*
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff -ruN /usr/ports/graphics/gthumb2/distinfo gthumb2/distinfo
--- /usr/ports/graphics/gthumb2/distinfo	Tue Sep 30 00:21:58 2003
+++ gthumb2/distinfo	Tue Oct 14 22:56:43 2003
@@ -1 +1 @@
-MD5 (gnome2/gthumb-2.1.6.tar.bz2) = 7edd153e01bff1c7464dc1a549d24819
+MD5 (gnome2/gthumb-2.1.7.tar.bz2) = 9c45a5d9639d074262a4f9d04ea42901
diff -ruN /usr/ports/graphics/gthumb2/files/patch-add-include-prefix gthumb2/files/patch-add-include-prefix
--- /usr/ports/graphics/gthumb2/files/patch-add-include-prefix	Thu Jan  1 01:00:00 1970
+++ gthumb2/files/patch-add-include-prefix	Tue Oct 14 23:30:10 2003
@@ -0,0 +1,5 @@
+--- add-include-prefix.orig	Mon Oct 13 23:16:42 2003
++++ add-include-prefix	Tue Oct 14 23:29:49 2003
+@@ -1 +1 @@
+-sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'
++sed -e 's/^/ /' -e 's/ \+$//' -e 's/ / -I /g' -e 's/^ \+//'
diff -ruN /usr/ports/graphics/gthumb2/pkg-plist gthumb2/pkg-plist
--- /usr/ports/graphics/gthumb2/pkg-plist	Tue Sep 30 22:37:17 2003
+++ gthumb2/pkg-plist	Tue Oct 14 23:43:04 2003
@@ -149,19 +149,16 @@
 share/gnome/gthumb/icons/rotate.png
 share/gnome/gthumb/icons/rotate.xpm
 share/gnome/help/gthumb/C/figures/comment.png
-share/gnome/help/gthumb/C/figures/dlg-comment.png
-share/gnome/help/gthumb/C/figures/find-images.png
 share/gnome/help/gthumb/C/figures/main-win.png
 share/gnome/help/gthumb/C/figures/nav-button.png
 share/gnome/help/gthumb/C/figures/preferences.png
-share/gnome/help/gthumb/C/figures/search-progress.png
-share/gnome/help/gthumb/C/figures/search-result.png
 share/gnome/help/gthumb/C/gthumb.xml
 share/gnome/help/gthumb/C/legal.xml
 share/gnome/omf/gthumb/gthumb-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gthumb/gthumb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gthumb.png
 share/locale/am/LC_MESSAGES/gthumb.mo
+share/locale/az/LC_MESSAGES/gthumb.mo
 share/locale/be/LC_MESSAGES/gthumb.mo
 share/locale/ca/LC_MESSAGES/gthumb.mo
 share/locale/cs/LC_MESSAGES/gthumb.mo
@@ -170,6 +167,7 @@
 share/locale/es/LC_MESSAGES/gthumb.mo
 share/locale/fr/LC_MESSAGES/gthumb.mo
 share/locale/ga/LC_MESSAGES/gthumb.mo
+share/locale/hu/LC_MESSAGES/gthumb.mo
 share/locale/it/LC_MESSAGES/gthumb.mo
 share/locale/ja/LC_MESSAGES/gthumb.mo
 share/locale/ko/LC_MESSAGES/gthumb.mo
>Release-Note:
>Audit-Trail:
>Unformatted: