Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Oct 2012 12:10:16 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305158 - in head/astro/gpscorrelate: . files
Message-ID:  <201210021210.q92CAGo9033824@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210021210.q92CAGo9033824>