From nobody@FreeBSD.org  Sat Oct 23 20:56:59 2010
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 71A831065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Oct 2010 20:56:59 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 5FC468FC0A
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Oct 2010 20:56:59 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o9NKuxE7063332
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 23 Oct 2010 20:56:59 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o9NKuwme063329;
	Sat, 23 Oct 2010 20:56:58 GMT
	(envelope-from nobody)
Message-Id: <201010232056.o9NKuwme063329@www.freebsd.org>
Date: Sat, 23 Oct 2010 20:56:58 GMT
From: Matt Dawson <matt@chronos.org.uk>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] comms/gpredict to v1.2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         151667
>Category:       ports
>Synopsis:       [maintainer-update] comms/gpredict to v1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 23 21:00:20 UTC 2010
>Closed-Date:    Fri Oct 29 21:42:21 UTC 2010
>Last-Modified:  Fri Oct 29 21:50:04 UTC 2010
>Originator:     Matt Dawson
>Release:        8.1-RELEASE
>Organization:
n/a
>Environment:
FreeBSD tinderbox 8.1-RELEASE FreeBSD 8.1-RELEASE #1 r210314M: Sat Aug 28 13:41:31 BST 2010     root@tinderbox:/usr/obj/usr/src/sys/TINDERBOX  amd64
>Description:
[maintainer-update] comms/gpredict needs updating to v1.2 released 2010-10-19
>How-To-Repeat:
n/a
>Fix:
Diff attached

Patch attached with submission follows:

diff -ruN ./gpredict/Makefile ./gpredict-devel/Makefile
--- ./gpredict/Makefile	2010-04-26 15:21:49.000000000 +0100
+++ ./gpredict-devel/Makefile	2010-10-23 21:53:30.000000000 +0100
@@ -5,10 +5,10 @@
 # $FreeBSD: ports/comms/gpredict/Makefile,v 1.21 2010/03/28 06:31:58 dinoex Exp $
 
 PORTNAME=	gpredict
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.2
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	matt@chronos.org.uk
 COMMENT=	Amateur Radio satellite tracking and prediction
@@ -18,13 +18,22 @@
 BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
-USE_GNOME=	gtk20 gnomehack
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-network
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--localedir=${PREFIX}/share/locale
+
 USE_GMAKE=	yes
 
 MAN1=		gpredict.1
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=        --disable-nls
+PLIST_SUB+=             NLS="@comment "
+.else
+PLIST_SUB+=             NLS=""
+.endif
+
 DESKTOP_ENTRIES="GPREDICT" \
 		"Predict satellite passage times" \
 		"${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \
diff -ruN ./gpredict/distinfo ./gpredict-devel/distinfo
--- ./gpredict/distinfo	2010-01-03 17:52:02.000000000 +0000
+++ ./gpredict-devel/distinfo	2010-10-23 21:22:55.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (gpredict-1.1.tar.gz) = 6d88bd51000e3f65962e60d0ab042229
-SHA256 (gpredict-1.1.tar.gz) = eb38ce0b961fbf52ce294cd3d648fa97e8db298f96f0fb4dd8ceb960827f6cf9
-SIZE (gpredict-1.1.tar.gz) = 4101711
+MD5 (gpredict-1.2.tar.gz) = 9b46a3e0fe2de276b15ae10f72be0fca
+SHA256 (gpredict-1.2.tar.gz) = ff4e4e912ac723eab63ce78876d5a521c29a4abe6d20e98904d483d63d25388a
+SIZE (gpredict-1.2.tar.gz) = 4682391
diff -ruN ./gpredict/files/patch.aclocal.m4 ./gpredict-devel/files/patch.aclocal.m4
--- ./gpredict/files/patch.aclocal.m4	1970-01-01 01:00:00.000000000 +0100
+++ ./gpredict-devel/files/patch.aclocal.m4	2009-12-18 15:22:20.000000000 +0000
@@ -0,0 +1,15 @@
+--- gpredict-1.1/aclocal.m4.orig	2009-12-18 15:20:40.000000000 +0000
++++ gpredict-1.1/aclocal.m4	2009-12-18 15:21:25.000000000 +0000
+@@ -415,11 +415,7 @@
+ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+ datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+-  localedir=`eval echo "${libdir}/locale"`
+-else
+-  localedir=`eval echo "${datadir}/locale"`
+-fi
++localedir=`eval echo "${datadir}/locale"`
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+ datarootdir="$glib_save_datarootdir"
diff -ruN ./gpredict/pkg-plist ./gpredict-devel/pkg-plist
--- ./gpredict/pkg-plist	2010-01-03 17:52:02.000000000 +0000
+++ ./gpredict-devel/pkg-plist	2010-10-23 21:43:09.000000000 +0100
@@ -75,6 +75,12 @@
 %%DATADIR%%/data/trsp/33499.trsp
 %%DATADIR%%/data/trsp/33591.trsp
 %%DATADIR%%/data/trsp/35865.trsp
+%%DATADIR%%/data/trsp/35870.trsp
+%%DATADIR%%/data/trsp/35932.trsp
+%%DATADIR%%/data/trsp/35933.trsp
+%%DATADIR%%/data/trsp/35934.trsp
+%%DATADIR%%/data/trsp/35935.trsp
+%%DATADIR%%/data/trsp/36122.trsp
 %%DATADIR%%/data/trsp/7530.trsp
 share/pixmaps/gpredict/icons/gpredict-antenna.png
 share/pixmaps/gpredict/icons/gpredict-azel-small.png
@@ -83,10 +89,17 @@
 share/pixmaps/gpredict/icons/gpredict-clock.png
 share/pixmaps/gpredict/icons/gpredict-crash.png
 share/pixmaps/gpredict/icons/gpredict-icon.png
-share/pixmaps/gpredict/icons/gpredict-layout-1.png
-share/pixmaps/gpredict/icons/gpredict-layout-2.png
-share/pixmaps/gpredict/icons/gpredict-layout-3.png
-share/pixmaps/gpredict/icons/gpredict-layout-4.png
+share/pixmaps/gpredict/icons/gpredict-layout-00.png
+share/pixmaps/gpredict/icons/gpredict-layout-01.png
+share/pixmaps/gpredict/icons/gpredict-layout-02.png
+share/pixmaps/gpredict/icons/gpredict-layout-03.png
+share/pixmaps/gpredict/icons/gpredict-layout-04.png
+share/pixmaps/gpredict/icons/gpredict-layout-05.png
+share/pixmaps/gpredict/icons/gpredict-layout-06.png
+share/pixmaps/gpredict/icons/gpredict-layout-07.png
+share/pixmaps/gpredict/icons/gpredict-layout-08.png
+share/pixmaps/gpredict/icons/gpredict-layout-99.png
+share/pixmaps/gpredict/icons/gpredict-leds.png
 share/pixmaps/gpredict/icons/gpredict-mod-attach.png
 share/pixmaps/gpredict/icons/gpredict-mod-close.png
 share/pixmaps/gpredict/icons/gpredict-mod-config.png
@@ -118,9 +131,17 @@
 share/pixmaps/gpredict/icons/gpredict-oscilloscope-small.png
 share/pixmaps/gpredict/icons/gpredict-shuttle.png
 share/pixmaps/gpredict/icons/gpredict-shuttle-small.png
-share/locale/fr/LC_MESSAGES/gpredict.mo
-share/locale/en_GB/LC_MESSAGES/gpredict.mo
-share/locale/en_US/LC_MESSAGES/gpredict.mo                        
+%%NLS%%lib/locale/cs/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/de/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/en_GB/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/en_US/LC_MESSAGES/gpredict.mo                        
+%%NLS%%lib/locale/es/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/fi/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/fr/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/it/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/lt/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/ru/LC_MESSAGES/gpredict.mo
+%%NLS%%lib/locale/th/LC_MESSAGES/gpredict.mo
 @dirrm share/pixmaps/gpredict/maps
 @dirrm share/pixmaps/gpredict/icons
 @dirrm share/pixmaps/gpredict
@@ -128,5 +149,28 @@
 @dirrm %%DATADIR%%/data/trsp
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
+%%NLS%%@dirrmtry lib/locale/cs/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/de/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/en_GB/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/en_US/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/es/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/fi/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/fr/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/it/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/lt/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/ru/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/th/LC_MESSAGES
+%%NLS%%@dirrmtry lib/locale/cs
+%%NLS%%@dirrmtry lib/locale/de
+%%NLS%%@dirrmtry lib/locale/es
+%%NLS%%@dirrmtry lib/locale/fi
+%%NLS%%@dirrmtry lib/locale/fr
+%%NLS%%@dirrmtry lib/locale/it
+%%NLS%%@dirrmtry lib/locale/lt
+%%NLS%%@dirrmtry lib/locale/ru
+%%NLS%%@dirrmtry lib/locale/th
+%%NLS%%@dirrmtry lib/locale/fr
+%%NLS%%@dirrmtry lib/locale/en_GB
+%%NLS%%@dirrmtry lib/locale/en_US
+%%NLS%%@dirrmtry lib/locale
+


>Release-Note:
>Audit-Trail:

From: Matt Dawson <matt@chronos.org.uk>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/151667: [maintainer-update] comms/gpredict to v1.2
Date: Sat, 23 Oct 2010 23:25:51 +0100

 --Boundary-00=_vD2wMTyxtzrFRt6
 Content-Type: Text/Plain;
   charset="iso-8859-15"
 Content-Transfer-Encoding: 7bit
 
 On Saturday 23 October 2010 22:00:20 you wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `ports/151667'.
 > The individual assigned to look at your
 > report is: freebsd-ports-bugs.
 > 
 > You can access the state of your problem report at any time
 > via this link:
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=151667
 > 
 > >Category:       ports
 > >Responsible:    freebsd-ports-bugs
 > >Synopsis:       [maintainer-update] comms/gpredict to v1.2
 > >Arrival-Date:   Sat Oct 23 21:00:20 UTC 2010
 
 Ack! Wrong patch. Correct patch attached.
 -- 
 Matt Dawson
 MTD15-RIPE
 matt@chronos.org.uk
 
 --Boundary-00=_vD2wMTyxtzrFRt6
 Content-Type: text/plain;
   charset="ISO-8859-1";
   name="gpredict-1.2.diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="gpredict-1.2.diff.txt"
 
 diff -ruN ./gpredict/Makefile ./gpredict-devel/Makefile
 --- ./gpredict/Makefile	2010-04-26 15:21:49.000000000 +0100
 +++ ./gpredict-devel/Makefile	2010-10-23 23:20:43.000000000 +0100
 @@ -5,8 +5,7 @@
  # $FreeBSD: ports/comms/gpredict/Makefile,v 1.21 2010/03/28 06:31:58 dinoex Exp $
  
  PORTNAME=	gpredict
 -PORTVERSION=	1.1
 -PORTREVISION=	2
 +PORTVERSION=	1.2
  CATEGORIES=	comms hamradio
  MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
  
 @@ -18,13 +17,21 @@
  BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  
 -USE_GNOME=	gtk20 gnomehack
 +USE_GNOME=	gtk20
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--enable-network
 +CONFIGURE_ARGS=	--enable-network --prefix=${PREFIX} \
 +		--localedir=${PREFIX}/share/locale
  USE_GMAKE=	yes
  
  MAN1=		gpredict.1
  
 +.if defined(WITHOUT_NLS)
 +CONFIGURE_ARGS+=        --disable-nls
 +PLIST_SUB+=             NLS="@comment "
 +.else
 +PLIST_SUB+=             NLS=""
 +.endif
 +
  DESKTOP_ENTRIES="GPREDICT" \
  		"Predict satellite passage times" \
  		"${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \
 diff -ruN ./gpredict/distinfo ./gpredict-devel/distinfo
 --- ./gpredict/distinfo	2010-01-03 17:52:02.000000000 +0000
 +++ ./gpredict-devel/distinfo	2010-10-23 21:22:55.000000000 +0100
 @@ -1,3 +1,3 @@
 -MD5 (gpredict-1.1.tar.gz) = 6d88bd51000e3f65962e60d0ab042229
 -SHA256 (gpredict-1.1.tar.gz) = eb38ce0b961fbf52ce294cd3d648fa97e8db298f96f0fb4dd8ceb960827f6cf9
 -SIZE (gpredict-1.1.tar.gz) = 4101711
 +MD5 (gpredict-1.2.tar.gz) = 9b46a3e0fe2de276b15ae10f72be0fca
 +SHA256 (gpredict-1.2.tar.gz) = ff4e4e912ac723eab63ce78876d5a521c29a4abe6d20e98904d483d63d25388a
 +SIZE (gpredict-1.2.tar.gz) = 4682391
 diff -ruN ./gpredict/pkg-plist ./gpredict-devel/pkg-plist
 --- ./gpredict/pkg-plist	2010-01-03 17:52:02.000000000 +0000
 +++ ./gpredict-devel/pkg-plist	2010-10-23 21:43:09.000000000 +0100
 @@ -75,6 +75,12 @@
  %%DATADIR%%/data/trsp/33499.trsp
  %%DATADIR%%/data/trsp/33591.trsp
  %%DATADIR%%/data/trsp/35865.trsp
 +%%DATADIR%%/data/trsp/35870.trsp
 +%%DATADIR%%/data/trsp/35932.trsp
 +%%DATADIR%%/data/trsp/35933.trsp
 +%%DATADIR%%/data/trsp/35934.trsp
 +%%DATADIR%%/data/trsp/35935.trsp
 +%%DATADIR%%/data/trsp/36122.trsp
  %%DATADIR%%/data/trsp/7530.trsp
  share/pixmaps/gpredict/icons/gpredict-antenna.png
  share/pixmaps/gpredict/icons/gpredict-azel-small.png
 @@ -83,10 +89,17 @@
  share/pixmaps/gpredict/icons/gpredict-clock.png
  share/pixmaps/gpredict/icons/gpredict-crash.png
  share/pixmaps/gpredict/icons/gpredict-icon.png
 -share/pixmaps/gpredict/icons/gpredict-layout-1.png
 -share/pixmaps/gpredict/icons/gpredict-layout-2.png
 -share/pixmaps/gpredict/icons/gpredict-layout-3.png
 -share/pixmaps/gpredict/icons/gpredict-layout-4.png
 +share/pixmaps/gpredict/icons/gpredict-layout-00.png
 +share/pixmaps/gpredict/icons/gpredict-layout-01.png
 +share/pixmaps/gpredict/icons/gpredict-layout-02.png
 +share/pixmaps/gpredict/icons/gpredict-layout-03.png
 +share/pixmaps/gpredict/icons/gpredict-layout-04.png
 +share/pixmaps/gpredict/icons/gpredict-layout-05.png
 +share/pixmaps/gpredict/icons/gpredict-layout-06.png
 +share/pixmaps/gpredict/icons/gpredict-layout-07.png
 +share/pixmaps/gpredict/icons/gpredict-layout-08.png
 +share/pixmaps/gpredict/icons/gpredict-layout-99.png
 +share/pixmaps/gpredict/icons/gpredict-leds.png
  share/pixmaps/gpredict/icons/gpredict-mod-attach.png
  share/pixmaps/gpredict/icons/gpredict-mod-close.png
  share/pixmaps/gpredict/icons/gpredict-mod-config.png
 @@ -118,9 +131,17 @@
  share/pixmaps/gpredict/icons/gpredict-oscilloscope-small.png
  share/pixmaps/gpredict/icons/gpredict-shuttle.png
  share/pixmaps/gpredict/icons/gpredict-shuttle-small.png
 -share/locale/fr/LC_MESSAGES/gpredict.mo
 -share/locale/en_GB/LC_MESSAGES/gpredict.mo
 -share/locale/en_US/LC_MESSAGES/gpredict.mo                        
 +%%NLS%%lib/locale/cs/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/de/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/en_GB/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/en_US/LC_MESSAGES/gpredict.mo                        
 +%%NLS%%lib/locale/es/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/fi/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/fr/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/it/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/lt/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/ru/LC_MESSAGES/gpredict.mo
 +%%NLS%%lib/locale/th/LC_MESSAGES/gpredict.mo
  @dirrm share/pixmaps/gpredict/maps
  @dirrm share/pixmaps/gpredict/icons
  @dirrm share/pixmaps/gpredict
 @@ -128,5 +149,28 @@
  @dirrm %%DATADIR%%/data/trsp
  @dirrm %%DATADIR%%/data
  @dirrm %%DATADIR%%
 -@dirrmtry share/locale/en_US/LC_MESSAGES
 -@dirrmtry share/locale/en_US
 +%%NLS%%@dirrmtry lib/locale/cs/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/de/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/en_GB/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/en_US/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/es/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/fi/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/fr/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/it/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/lt/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/ru/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/th/LC_MESSAGES
 +%%NLS%%@dirrmtry lib/locale/cs
 +%%NLS%%@dirrmtry lib/locale/de
 +%%NLS%%@dirrmtry lib/locale/es
 +%%NLS%%@dirrmtry lib/locale/fi
 +%%NLS%%@dirrmtry lib/locale/fr
 +%%NLS%%@dirrmtry lib/locale/it
 +%%NLS%%@dirrmtry lib/locale/lt
 +%%NLS%%@dirrmtry lib/locale/ru
 +%%NLS%%@dirrmtry lib/locale/th
 +%%NLS%%@dirrmtry lib/locale/fr
 +%%NLS%%@dirrmtry lib/locale/en_GB
 +%%NLS%%@dirrmtry lib/locale/en_US
 +%%NLS%%@dirrmtry lib/locale
 +
 
 --Boundary-00=_vD2wMTyxtzrFRt6--
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Fri Oct 29 13:06:59 UTC 2010 
State-Changed-Why:  
Is the lib/locale path for gettext files correct? 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Fri Oct 29 13:06:59 UTC 2010 
Responsible-Changed-Why:  
Track 

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

From: Matt Dawson <matt@chronos.org.uk>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/151667: [maintainer-update] comms/gpredict to v1.2
Date: Fri, 29 Oct 2010 16:44:28 +0100

 --Boundary-00=_dvuyMUbTzoM4sy4
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 Sorry about that Pav, I forgot that this was the issue the last time I 
 attempted to enable NLS. This time I've finally tracked it down to the 
 autotools setup. New diff attached which should be correct. Also added 
 LICENSE, hopefully in the correct place (portlint is happy).
 -- 
 Matt Dawson
 MTD15-RIPE
 matt@chronos.org.uk
 
 --Boundary-00=_dvuyMUbTzoM4sy4
 Content-Type: text/plain;
   charset="ISO-8859-1";
   name="gpredict-1.2.diff.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="gpredict-1.2.diff.txt"
 
 diff -ruN ./gpredict/Makefile ./gpredict-devel/Makefile
 --- ./gpredict/Makefile	2010-04-26 15:21:49.000000000 +0100
 +++ ./gpredict-devel/Makefile	2010-10-29 16:38:30.000000000 +0100
 @@ -5,8 +5,7 @@
  # $FreeBSD: ports/comms/gpredict/Makefile,v 1.21 2010/03/28 06:31:58 dinoex Exp $
  
  PORTNAME=	gpredict
 -PORTVERSION=	1.1
 -PORTREVISION=	2
 +PORTVERSION=	1.2
  CATEGORIES=	comms hamradio
  MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
  
 @@ -18,13 +17,22 @@
  BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
  
 -USE_GNOME=	gtk20 gnomehack
 +USE_GNOME=	gtk20
  GNU_CONFIGURE=	yes
 -CONFIGURE_ARGS=	--enable-network
 +CONFIGURE_ARGS=	--prefix=${PREFIX} --localedir=${PREFIX}/share/locale
  USE_GMAKE=	yes
  
  MAN1=		gpredict.1
  
 +LICENSE=	GPLv2
 +
 +.if defined(WITHOUT_NLS)
 +CONFIGURE_ARGS+=        --disable-nls
 +PLIST_SUB+=             NLS="@comment "
 +.else
 +PLIST_SUB+=             NLS=""
 +.endif
 +
  DESKTOP_ENTRIES="GPREDICT" \
  		"Predict satellite passage times" \
  		"${PREFIX}/share/pixmaps/gpredict/icons/gpredict-icon.png" \
 diff -ruN ./gpredict/distinfo ./gpredict-devel/distinfo
 --- ./gpredict/distinfo	2010-01-03 17:52:02.000000000 +0000
 +++ ./gpredict-devel/distinfo	2010-10-23 21:22:55.000000000 +0100
 @@ -1,3 +1,3 @@
 -MD5 (gpredict-1.1.tar.gz) = 6d88bd51000e3f65962e60d0ab042229
 -SHA256 (gpredict-1.1.tar.gz) = eb38ce0b961fbf52ce294cd3d648fa97e8db298f96f0fb4dd8ceb960827f6cf9
 -SIZE (gpredict-1.1.tar.gz) = 4101711
 +MD5 (gpredict-1.2.tar.gz) = 9b46a3e0fe2de276b15ae10f72be0fca
 +SHA256 (gpredict-1.2.tar.gz) = ff4e4e912ac723eab63ce78876d5a521c29a4abe6d20e98904d483d63d25388a
 +SIZE (gpredict-1.2.tar.gz) = 4682391
 diff -ruN ./gpredict/files/patch-aclocal.m4 ./gpredict-devel/files/patch-aclocal.m4
 --- ./gpredict/files/patch-aclocal.m4	1970-01-01 01:00:00.000000000 +0100
 +++ ./gpredict-devel/files/patch-aclocal.m4	2010-10-29 16:16:29.000000000 +0100
 @@ -0,0 +1,15 @@
 +--- aclocal.m4.orig	2010-10-12 10:50:43.000000000 +0100
 ++++ aclocal.m4	2010-10-29 16:11:26.000000000 +0100
 +@@ -415,11 +415,7 @@
 + test "x$prefix" = xNONE && prefix=$ac_default_prefix
 + test "x$exec_prefix" = xNONE && exec_prefix=$prefix
 + datarootdir=`eval echo "${datarootdir}"`
 +-if test "x$CATOBJEXT" = "x.mo" ; then
 +-  localedir=`eval echo "${libdir}/locale"`
 +-else
 +-  localedir=`eval echo "${datadir}/locale"`
 +-fi
 ++localedir=`eval echo "${datadir}/locale"`
 + prefix="$glib_save_prefix"
 + exec_prefix="$glib_save_exec_prefix"
 + datarootdir="$glib_save_datarootdir"
 diff -ruN ./gpredict/files/patch-po-Makefile.in.in ./gpredict-devel/files/patch-po-Makefile.in.in
 --- ./gpredict/files/patch-po-Makefile.in.in	1970-01-01 01:00:00.000000000 +0100
 +++ ./gpredict-devel/files/patch-po-Makefile.in.in	2010-10-29 16:20:17.000000000 +0100
 @@ -0,0 +1,11 @@
 +--- po/Makefile.in.in.orig	2010-10-29 16:19:07.000000000 +0100
 ++++ po/Makefile.in.in	2010-10-29 16:19:25.000000000 +0100
 +@@ -34,7 +34,7 @@
 + datarootdir = @datarootdir@
 + libdir = @libdir@
 + DATADIRNAME = @DATADIRNAME@
 +-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
 ++itlocaledir = $(datadir)/locale
 + subdir = po
 + install_sh = @install_sh@
 + # Automake >= 1.8 provides @mkdir_p@.
 diff -ruN ./gpredict/files/patch-src-Makefile.am ./gpredict-devel/files/patch-src-Makefile.am
 --- ./gpredict/files/patch-src-Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ ./gpredict-devel/files/patch-src-Makefile.am	2010-10-29 16:18:04.000000000 +0100
 @@ -0,0 +1,11 @@
 +--- src/Makefile.am.orig	2010-10-29 16:16:59.000000000 +0100
 ++++ src/Makefile.am	2010-10-29 16:17:12.000000000 +0100
 +@@ -7,7 +7,7 @@
 + 	-DDATADIR=\""$(datadir)"\" \
 + 	-DPACKAGE_DATA_DIR=\""$(datadir)/gpredict"\" \
 + 	-DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/gpredict"\" \
 +-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/locale"\"
 ++	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\"
 + 
 + ## We have to disable these for now because GtkTooltips have been
 + ## deprecated in Gtk+ 2.12
 diff -ruN ./gpredict/pkg-plist ./gpredict-devel/pkg-plist
 --- ./gpredict/pkg-plist	2010-01-03 17:52:02.000000000 +0000
 +++ ./gpredict-devel/pkg-plist	2010-10-29 16:34:07.000000000 +0100
 @@ -75,6 +75,12 @@
  %%DATADIR%%/data/trsp/33499.trsp
  %%DATADIR%%/data/trsp/33591.trsp
  %%DATADIR%%/data/trsp/35865.trsp
 +%%DATADIR%%/data/trsp/35870.trsp
 +%%DATADIR%%/data/trsp/35932.trsp
 +%%DATADIR%%/data/trsp/35933.trsp
 +%%DATADIR%%/data/trsp/35934.trsp
 +%%DATADIR%%/data/trsp/35935.trsp
 +%%DATADIR%%/data/trsp/36122.trsp
  %%DATADIR%%/data/trsp/7530.trsp
  share/pixmaps/gpredict/icons/gpredict-antenna.png
  share/pixmaps/gpredict/icons/gpredict-azel-small.png
 @@ -83,10 +89,17 @@
  share/pixmaps/gpredict/icons/gpredict-clock.png
  share/pixmaps/gpredict/icons/gpredict-crash.png
  share/pixmaps/gpredict/icons/gpredict-icon.png
 -share/pixmaps/gpredict/icons/gpredict-layout-1.png
 -share/pixmaps/gpredict/icons/gpredict-layout-2.png
 -share/pixmaps/gpredict/icons/gpredict-layout-3.png
 -share/pixmaps/gpredict/icons/gpredict-layout-4.png
 +share/pixmaps/gpredict/icons/gpredict-layout-00.png
 +share/pixmaps/gpredict/icons/gpredict-layout-01.png
 +share/pixmaps/gpredict/icons/gpredict-layout-02.png
 +share/pixmaps/gpredict/icons/gpredict-layout-03.png
 +share/pixmaps/gpredict/icons/gpredict-layout-04.png
 +share/pixmaps/gpredict/icons/gpredict-layout-05.png
 +share/pixmaps/gpredict/icons/gpredict-layout-06.png
 +share/pixmaps/gpredict/icons/gpredict-layout-07.png
 +share/pixmaps/gpredict/icons/gpredict-layout-08.png
 +share/pixmaps/gpredict/icons/gpredict-layout-99.png
 +share/pixmaps/gpredict/icons/gpredict-leds.png
  share/pixmaps/gpredict/icons/gpredict-mod-attach.png
  share/pixmaps/gpredict/icons/gpredict-mod-close.png
  share/pixmaps/gpredict/icons/gpredict-mod-config.png
 @@ -118,9 +131,17 @@
  share/pixmaps/gpredict/icons/gpredict-oscilloscope-small.png
  share/pixmaps/gpredict/icons/gpredict-shuttle.png
  share/pixmaps/gpredict/icons/gpredict-shuttle-small.png
 -share/locale/fr/LC_MESSAGES/gpredict.mo
 -share/locale/en_GB/LC_MESSAGES/gpredict.mo
 -share/locale/en_US/LC_MESSAGES/gpredict.mo                        
 +%%NLS%%share/locale/cs/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/de/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/en_GB/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/en_US/LC_MESSAGES/gpredict.mo                        
 +%%NLS%%share/locale/es/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/fi/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/fr/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/lt/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/ru/LC_MESSAGES/gpredict.mo
 +%%NLS%%share/locale/th/LC_MESSAGES/gpredict.mo
  @dirrm share/pixmaps/gpredict/maps
  @dirrm share/pixmaps/gpredict/icons
  @dirrm share/pixmaps/gpredict
 @@ -128,5 +149,27 @@
  @dirrm %%DATADIR%%/data/trsp
  @dirrm %%DATADIR%%/data
  @dirrm %%DATADIR%%
 -@dirrmtry share/locale/en_US/LC_MESSAGES
 -@dirrmtry share/locale/en_US
 +%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/th/LC_MESSAGES
 +%%NLS%%@dirrmtry share/locale/cs
 +%%NLS%%@dirrmtry share/locale/de
 +%%NLS%%@dirrmtry share/locale/es
 +%%NLS%%@dirrmtry share/locale/fi
 +%%NLS%%@dirrmtry share/locale/fr
 +%%NLS%%@dirrmtry share/locale/it
 +%%NLS%%@dirrmtry share/locale/lt
 +%%NLS%%@dirrmtry share/locale/ru
 +%%NLS%%@dirrmtry share/locale/th
 +%%NLS%%@dirrmtry share/locale/fr
 +%%NLS%%@dirrmtry share/locale/en_GB
 +%%NLS%%@dirrmtry share/locale/en_US
 +%%NLS%%@dirrmtry share/locale
 
 --Boundary-00=_dvuyMUbTzoM4sy4--
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Fri Oct 29 21:41:21 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

Note you don't need to patch various *.am files when you're not going to rerun 
automake (you're working from configure+*.in phase). 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151667: commit references a PR
Date: Fri, 29 Oct 2010 21:41:43 +0000 (UTC)

 pav         2010-10-29 21:41:39 UTC
 
   FreeBSD ports repository
 
   Modified files:
     comms/gpredict       Makefile distinfo pkg-plist 
   Added files:
     comms/gpredict/files patch-po-Makefile.in.in 
   Log:
   - Update to 1.2
   
   PR:             ports/151667
   Submitted by:   Matt Dawson <matt@chronos.org.uk> (maintainer)
   
   Revision  Changes    Path
   1.22      +13 -4     ports/comms/gpredict/Makefile
   1.10      +3 -3      ports/comms/gpredict/distinfo
   1.1       +11 -0     ports/comms/gpredict/files/patch-po-Makefile.in.in (new)
   1.8       +83 -62    ports/comms/gpredict/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
