From tkato432@yahoo.com  Tue Sep 25 18:00:26 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id BE5C21065677
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:00:26 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa104lp.auone-net.jp (msa104lp.auone-net.jp [222.3.140.167])
	by mx1.freebsd.org (Postfix) with ESMTP id 7D27A8FC17
	for <FreeBSD-gnats-submit@FreeBSD.org>; Tue, 25 Sep 2012 18:00:22 +0000 (UTC)
Received: from msa104lp.auone-net.jp (MSA104lp [172.27.12.182])
	by msa104lp.auone-net.jp (au one net msa) with ESMTP id C579358C2C3
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 26 Sep 2012 03:00:21 +0900 (JST)
Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63])
	by msa104lp.auone-net.jp (au one net msa) with ESMTP id CF44C2BC03B
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 26 Sep 2012 03:00:09 +0900 (JST)
Message-Id: <20120926022007.e112b5c7fe83fbf0d0bb15ac@yahoo.com>
Date: Wed, 26 Sep 2012 02:20:07 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: astro/gpscorrelate: Update to version 1.6.1

>Number:         171955
>Category:       ports
>Synopsis:       astro/gpscorrelate: Update to version 1.6.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    madpilot
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 25 18:10:07 UTC 2012
>Closed-Date:    Tue Oct 02 12:10:24 UTC 2012
>Last-Modified:  Tue Oct  2 12:20:04 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Update to version 1.6.1

Remove file:
files/gpscorrelate-gui.1
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/astro/gpscorrelate/Makefile astro/gpscorrelate/Makefile
--- /usr/ports/astro/gpscorrelate/Makefile	2012-09-23 06:26:45.000000000 +0900
+++ astro/gpscorrelate/Makefile	2012-09-24 23:04:41.000000000 +0900
@@ -1,37 +1,55 @@
-# New ports collection makefile for:	gpscorrelate
-# Date created:				Feb 2008
-# Whom:					Lukas Maly
-#
+# Created by: Lukas Maly
 # $FreeBSD: ports/astro/gpscorrelate/Makefile,v 1.11 2012/09/22 21:26:45 pav Exp $
 
 PORTNAME=	gpscorrelate
-PORTVERSION=	1.5.6
-PORTREVISION=	9
+PORTVERSION=	1.6.1
 CATEGORIES=	astro geography
 MASTER_SITES=	http://freefoote.dview.net/linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A gps file gpx correlate exif tag in photos
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	exiv2.12:${PORTSDIR}/graphics/exiv2 \
 		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 
-MAN1=		gpscorrelate.1 gpscorrelate-gui.1
+OPTIONS_DEFINE=	DOCS
+
+USE_GNOME=	libxml2
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		gpscorrelate.1
+MLINKS=		gpscorrelate.1 gpscorrelate-gui.1
+PORTDOCS=	*
+PLIST_FILES=	bin/gpscorrelate bin/gpscorrelate-gui
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^CFLAGS|#CFLAGS| ; \
+		 s|^override CFLAGS|override IFLAGS| ; \
+		 s|gtk+-2.0)|gtk+-2.0 exiv2)| ; \
+		 s|-I/usr/include/exiv2|| ; \
+		 s|-lexiv2|| ; \
+		 /^all:/s|gpscorrelate.1|| ; \
+		 s|g++ $$(OFLAGS)|$$(CXX) $$(OFLAGS)| ; \
+		 s|g++ $$(CFLAGS)|$$(CXX) $$(CXXFLAGS) $$(IFLAGS)| ; \
+		 s|gcc $$(CFLAGS)|$$(CC) $$(CFLAGS) $$(IFLAGS)|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gpscorrelate ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/gpscorrelate-gui ${PREFIX}/bin
-	${INSTALL_MAN} ${FILESDIR}/gpscorrelate* ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/gpscorrelate
-	${MKDIR} ${PREFIX}/share/gpscorrelate
-	${MKDIR} ${PREFIX}/share/doc/gpscorrelate/html
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/gpscorrelate/html
-	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${PREFIX}/share/doc/gpscorrelate/html
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/gpscorrelate/
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gpscorrelate/
-	${INSTALL_DATA} ${WRKSRC}/RELEASES ${PREFIX}/share/gpscorrelate/
+	${INSTALL_MAN} ${FILESDIR}/gpscorrelate.1 ${MANPREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/RELEASES ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/html
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/astro/gpscorrelate/distinfo astro/gpscorrelate/distinfo
--- /usr/ports/astro/gpscorrelate/distinfo	2011-03-19 21:27:32.000000000 +0900
+++ astro/gpscorrelate/distinfo	2012-09-24 19:37:09.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (gpscorrelate-1.5.6.tar.gz) = cbd75278f8707b63c135af5ec83b4323b17313b23cdd0b29fcb1d786c50e1a2e
-SIZE (gpscorrelate-1.5.6.tar.gz) = 130623
+SHA256 (gpscorrelate-1.6.1.tar.gz) = 966285c0a6df5ac2cc63c1f9650e65c70e303cf11d08dc283357bcd745cb5201
+SIZE (gpscorrelate-1.6.1.tar.gz) = 154531
diff -urN /usr/ports/astro/gpscorrelate/files/gpscorrelate-gui.1 astro/gpscorrelate/files/gpscorrelate-gui.1
--- /usr/ports/astro/gpscorrelate/files/gpscorrelate-gui.1	2008-03-08 05:18:17.000000000 +0900
+++ astro/gpscorrelate/files/gpscorrelate-gui.1	1970-01-01 09:00:00.000000000 +0900
@@ -1,115 +0,0 @@
-.\"     Title: GPSCORRELATE
-.\"    Author: Stefano Zacchiroli
-.\" Generator: DocBook XSL Stylesheets v1.70.1 <http://docbook.sf.net/>
-.\"      Date: 08 Sep 2006
-.\"    Manual: 
-.\"    Source: 
-.\"
-.TH "GPSCORRELATE" "1" "08 Sep 2006" "" ""
-.\" disable hyphenation
-.nh
-.\" disable justification (adjust text to left margin only)
-.ad l
-.SH "NAME"
-gpscorrelate \- correlates digital photos with GPS data filling EXIF fields
-.SH "SYNOPSIS"
-.HP 13
-\fBgpscorrelate\fR [\fB\-g\ \fR\fB\fIfile.gpx\fR\fR] [\fIoption\fR...]
-.HP 17
-\fBgpscorrelate\-gui\fR
-.SH "DESCRIPTION"
-.PP
-This manual page documents briefly the
-\fBgpscorrelate\fR
-and
-\fBgpscorrelate\-gui\fR
-commands.
-.PP
-This manual page was written for the
-Debian(TM)
-distribution because the original programs do not have a manual page. Instead, they have documentation in HTML format; see below.
-.PP
-\fBgpscorrelate\fR
-is a program that acts on digital photo in JPEG format filling EXIF (Exchangeable Image File Format) fields related to GPS (Global Positioning System) information. Source for the GPS data is a record of GPS information encoded in GPX (GPS Exchange Format) Format. The act of filling those fields is referred to as
-\fIcorrelation\fR.
-.PP
-If GPS data are available at the precise moment the photo was taken (with a 1\-second granularity) the GPS data are stored unmodified in EXIF fields. If they are not linear interpolation of GPS data available at moments before and after the photo was taken can be used.
-.PP
-\fBgpscorrelate\fR
-is a command line tool implementing correlation whereas
-\fBgpscorrelate\-gui\fR
-is the corresponding GTK+ graphical user interface.
-.SH "OPTIONS"
-.PP
-These programs follow the usual
-GNU
-command line syntax, with long options starting with two dashes (`\-'). A summary of options is included below. For a complete description, see the HTML documentation.
-.TP 3n
-\fB\-g\fR, \fB\-\-gps\fR
-required, specifies GPX file with GPS data
-.TP 3n
-\fB\-z\fR, \fB\-\-timeadd\fR \fB+/\-\fR\fIXX\fR[\fB:\fR\fIXX\fR]
-time to add to GPS data to make it match photos. GPS data is in UTC; photos are not likely to be in UTC. Enter the timezone used when taking the photos: eg,
-\fB+8\fR
-for Perth
-.TP 3n
-\fB\-i\fR, \fB\-\-no\-interpolation\fR
-disable interpolation between points. Interpolation is linear, points are rounded if disabled
-.TP 3n
-\fB\-v\fR, \fB\-\-verbose\fR
-show what has been selected
-.TP 3n
-\fB\-d\fR, \fB\-\-datum\fR \fIdatum\fR
-specify measurement datum. If not set, WGS\-84 used
-.TP 3n
-\fB\-n\fR, \fB\-\-no\-write\fR
-do not write the exif data. Useful with
-\fB\-\-show\fR
-.TP 3n
-\fB\-m\fR, \fB\-\-max\-dist\fR \fItime\fR
-max time outside points that photo will be matched. Time is in seconds
-.TP 3n
-\fB\-s\fR, \fB\-\-show\fR
-Just show the GPS data from the given files, if it exists
-.TP 3n
-\fB\-o\fR, \fB\-\-machine\fR
-Just show the GPS data from the given files, machine readable output
-.TP 3n
-\fB\-r\fR, \fB\-\-remove\fR
-Strip GPS tags from the given files, and then quit
-.TP 3n
-\fB\-t\fR, \fB\-\-ignore\-tracksegs\fR
-Interpolate between track segments too
-.TP 3n
-\fB\-M\fR, \fB\-\-no\-mtime\fR
-Do not change mtime of modified files
-.TP 3n
-\fB\-h\fR, \fB\-\-help\fR
-Show summary of options.
-.SH "SEE ALSO"
-.PP
-gpsd (1), gpsbabel (1), gpxlogger (1), cgpxlogger (1).
-.PP
-The documentation of gpscorrelate and gpscorrelate\-gui in HTML format are available on the filesystem at
-\fI/usr/local/share/doc/gpscorrelate/html/\fR.
-.SH "AUTHOR"
-.PP
-This manual page was written by Stefano Zacchiroli
-<zack@debian.org>
-for the
-Debian(TM)
-system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the
-GNU
-General Public License, Version 2 any later version published by the Free Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL.
-.SH "AUTHOR"
-.PP
-\fBStefano\fR \fBZacchiroli\fR
-.sp -1n
-.IP "" 3n
-Author.
-.SH "COPYRIGHT"
-Copyright \(co 2006 Stefano Zacchiroli <zack@debian.org>
-.br
-
diff -urN /usr/ports/astro/gpscorrelate/pkg-plist astro/gpscorrelate/pkg-plist
--- /usr/ports/astro/gpscorrelate/pkg-plist	2008-03-08 05:18:17.000000000 +0900
+++ astro/gpscorrelate/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,13 +0,0 @@
-bin/gpscorrelate
-bin/gpscorrelate-gui
-share/gpscorrelate/README
-share/gpscorrelate/RELEASES
-share/gpscorrelate/command-line-options.txt
-share/doc/gpscorrelate/html/command.html
-share/doc/gpscorrelate/html/concepts.html
-share/doc/gpscorrelate/html/corr.png
-share/doc/gpscorrelate/html/gui.html
-share/doc/gpscorrelate/html/index.html
-@dirrm share/doc/gpscorrelate/html
-@dirrm share/doc/gpscorrelate
-@dirrm share/gpscorrelate
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->madpilot 
Responsible-Changed-By: madpilot 
Responsible-Changed-When: Tue Sep 25 21:13:10 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171955 
State-Changed-From-To: open->closed 
State-Changed-By: madpilot 
State-Changed-When: Tue Oct 2 12:10:23 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171955: commit references a PR
Date: Tue,  2 Oct 2012 12:10:49 +0000 (UTC)

 Author: madpilot
 Date: Tue Oct  2 12:10:16 2012
 New Revision: 305158
 URL: http://svn.freebsd.org/changeset/ports/305158
 
 Log:
   - Update to version 1.6.1
   - Trim Makefile headers
   
   PR:		ports/171955
   Submitted by: 	KATO Tsuguru <tkato432@yahoo.com>
 
 Deleted:
   head/astro/gpscorrelate/files/gpscorrelate-gui.1
   head/astro/gpscorrelate/pkg-plist
 Modified:
   head/astro/gpscorrelate/Makefile
   head/astro/gpscorrelate/distinfo   (contents, props changed)
 
 Modified: head/astro/gpscorrelate/Makefile
 ==============================================================================
 --- head/astro/gpscorrelate/Makefile	Tue Oct  2 11:49:42 2012	(r305157)
 +++ head/astro/gpscorrelate/Makefile	Tue Oct  2 12:10:16 2012	(r305158)
 @@ -1,37 +1,62 @@
 -# New ports collection makefile for:	gpscorrelate
 -# Date created:				Feb 2008
 -# Whom:					Lukas Maly
 -#
 +# Created by: Lukas Maly
  # $FreeBSD$
  
  PORTNAME=	gpscorrelate
 -PORTVERSION=	1.5.6
 -PORTREVISION=	9
 +PORTVERSION=	1.6.1
  CATEGORIES=	astro geography
  MASTER_SITES=	http://freefoote.dview.net/linux/
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	A gps file gpx correlate exif tag in photos
  
 -LIB_DEPENDS=	exiv2.12:${PORTSDIR}/graphics/exiv2 \
 -		gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
 +LICENSE=	GPLv2
  
 -MAN1=		gpscorrelate.1 gpscorrelate-gui.1
 +LIB_DEPENDS=	exiv2:${PORTSDIR}/graphics/exiv2 \
 +		gtkmm-2:${PORTSDIR}/x11-toolkits/gtkmm24
 +
 +OPTIONS_DEFINE=	DOCS
 +
 +USE_GNOME=	libxml2
 +USE_GMAKE=	yes
 +MAKE_JOBS_SAFE=	yes
 +
 +MAN1=		gpscorrelate.1
 +MLINKS=		gpscorrelate.1 gpscorrelate-gui.1
 +PORTDOCS=	*
 +PLIST_FILES=	bin/gpscorrelate bin/gpscorrelate-gui
 +
 +.include <bsd.port.options.mk>
 +
 +# This port depends on nan(3) added in r174684, Sun Dec 16 21:19:28 2007 UTC.
 +# There was no __FreeBSD_version bump for this change, so use the nearest one.
 +.if ${OSVERSION} < 800007
 +BROKEN=		Does not compile on 7.x: Requires nan(3)
 +.endif
  
  post-patch:
 -	@${REINPLACE_CMD} -e "s|-I/usr/include|-I${LOCALBASE}/include|" ${WRKSRC}/Makefile
 +	@${REINPLACE_CMD} -e \
 +	's|^CFLAGS|#CFLAGS| ; \
 +	s|^override CFLAGS|override IFLAGS| ; \
 +	s|gtk+-2.0)|gtk+-2.0 exiv2)| ; \
 +	s|-I/usr/include/exiv2|| ; \
 +	s|-lexiv2|| ; \
 +	/^all:/s|gpscorrelate.1|| ; \
 +	s|g++ $$(OFLAGS)|$$(CXX) $$(OFLAGS)| ; \
 +	s|g++ $$(CFLAGS)|$$(CXX) $$(CXXFLAGS) $$(IFLAGS)| ; \
 +	s|gcc $$(CFLAGS)|$$(CC) $$(CFLAGS) $$(IFLAGS)|' ${WRKSRC}/Makefile
 +
  
  do-install:
  	${INSTALL_PROGRAM} ${WRKSRC}/gpscorrelate ${PREFIX}/bin
  	${INSTALL_PROGRAM} ${WRKSRC}/gpscorrelate-gui ${PREFIX}/bin
 -	${INSTALL_MAN} ${FILESDIR}/gpscorrelate* ${PREFIX}/man/man1
 -	${MKDIR} ${PREFIX}/share/doc/gpscorrelate
 -	${MKDIR} ${PREFIX}/share/gpscorrelate
 -	${MKDIR} ${PREFIX}/share/doc/gpscorrelate/html
 -	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/gpscorrelate/html
 -	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${PREFIX}/share/doc/gpscorrelate/html
 -	${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/gpscorrelate/
 -	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/gpscorrelate/
 -	${INSTALL_DATA} ${WRKSRC}/RELEASES ${PREFIX}/share/gpscorrelate/
 +	${INSTALL_MAN} ${FILESDIR}/gpscorrelate.1 ${MANPREFIX}/man/man1
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 +	${INSTALL_DATA} ${WRKSRC}/RELEASES ${DOCSDIR}
 +	@${MKDIR} ${DOCSDIR}/html
 +	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/html
 +	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/html
 +.endif
  
  .include <bsd.port.mk>
 
 Modified: head/astro/gpscorrelate/distinfo
 ==============================================================================
 --- head/astro/gpscorrelate/distinfo	Tue Oct  2 11:49:42 2012	(r305157)
 +++ head/astro/gpscorrelate/distinfo	Tue Oct  2 12:10:16 2012	(r305158)
 @@ -1,2 +1,2 @@
 -SHA256 (gpscorrelate-1.5.6.tar.gz) = cbd75278f8707b63c135af5ec83b4323b17313b23cdd0b29fcb1d786c50e1a2e
 -SIZE (gpscorrelate-1.5.6.tar.gz) = 130623
 +SHA256 (gpscorrelate-1.6.1.tar.gz) = 966285c0a6df5ac2cc63c1f9650e65c70e303cf11d08dc283357bcd745cb5201
 +SIZE (gpscorrelate-1.6.1.tar.gz) = 154531
 _______________________________________________
 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:
