Date: Tue, 28 Jul 2015 02:40:17 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393046 - in head/graphics: . libchamplain08 Message-ID: <201507280240.t6S2eHq5045713@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Tue Jul 28 02:40:16 2015 New Revision: 393046 URL: https://svnweb.freebsd.org/changeset/ports/393046 Log: - Bring back libchamplain 0.8 (gtk2-related) This is needed as an optional dependency for graphics/geeqie - Take maintainership as suggested by kwm - Resolve conflicts with graphics/libchamplain - Make documentation optional PR: 201691 Added: head/graphics/libchamplain08/ - copied from r371283, head/graphics/libchamplain/ Modified: head/graphics/Makefile head/graphics/libchamplain08/Makefile head/graphics/libchamplain08/pkg-plist Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Tue Jul 28 01:34:45 2015 (r393045) +++ head/graphics/Makefile Tue Jul 28 02:40:16 2015 (r393046) @@ -471,6 +471,7 @@ SUBDIR += libcaca SUBDIR += libcdr01 SUBDIR += libchamplain + SUBDIR += libchamplain08 SUBDIR += libdmtx SUBDIR += libdrm SUBDIR += libecwj2 Modified: head/graphics/libchamplain08/Makefile ============================================================================== --- head/graphics/libchamplain/Makefile Mon Oct 20 17:04:20 2014 (r371283) +++ head/graphics/libchamplain08/Makefile Tue Jul 28 02:40:16 2015 (r393046) @@ -1,14 +1,13 @@ # Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/graphics/libchamplain/Makefile,v 1.23 2010/09/27 18:17:23 kwm Exp $ PORTNAME= libchamplain PORTVERSION= 0.8.1 -PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= GNOME +PKGNAMESUFFIX= 08 -MAINTAINER= gnome@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= C library provides a Gtk+ widget to display rasterized maps/markers LIB_DEPENDS= libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk \ @@ -24,6 +23,15 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lgthread-2.0 INSTALL_TARGET= install-strip -PLIST_SUB= VERSION=0.8 +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +DOCSDIRGTK= ${PREFIX}/share/doc/${PORTNAME}-gtk${PKGNAMESUFFIX} + +PLIST_SUB= VERSION=0.8 DOCSDIRGTK="${DOCSDIRGTK}" + +OPTIONS_DEFINE= DOCS + +post-install: + ${MV} ${STAGEDIR}${PREFIX}/share/doc/libchamplain ${STAGEDIR}${DOCSDIR} + ${MV} ${STAGEDIR}${PREFIX}/share/doc/libchamplain-gtk ${STAGEDIR}${DOCSDIRGTK} .include <bsd.port.mk> Modified: head/graphics/libchamplain08/pkg-plist ============================================================================== --- head/graphics/libchamplain/pkg-plist Mon Oct 20 17:04:20 2014 (r371283) +++ head/graphics/libchamplain08/pkg-plist Tue Jul 28 02:40:16 2015 (r393046) @@ -46,70 +46,70 @@ lib/libchamplain-gtk-%%VERSION%%.so.1 lib/libchamplain-gtk-%%VERSION%%.so.1.1.2 libdata/pkgconfig/champlain-%%VERSION%%.pc libdata/pkgconfig/champlain-gtk-%%VERSION%%.pc -share/doc/libchamplain-gtk/GtkChamplainEmbed.html -share/doc/libchamplain-gtk/home.png -share/doc/libchamplain-gtk/index.html -share/doc/libchamplain-gtk/index.sgml -share/doc/libchamplain-gtk/left.png -share/doc/libchamplain-gtk/libchamplain-gtk.devhelp -share/doc/libchamplain-gtk/libchamplain-gtk.devhelp2 -share/doc/libchamplain-gtk/pt01.html -share/doc/libchamplain-gtk/right.png -share/doc/libchamplain-gtk/style.css -share/doc/libchamplain-gtk/up.png -%%DOCSDIR%%/ChamplainBaseMarker.html -%%DOCSDIR%%/ChamplainErrorTileRenderer.html -%%DOCSDIR%%/ChamplainFileCache.html -%%DOCSDIR%%/ChamplainFileTileSource.html -%%DOCSDIR%%/ChamplainImageRenderer.html -%%DOCSDIR%%/ChamplainLayer.html -%%DOCSDIR%%/ChamplainMapSource.html -%%DOCSDIR%%/ChamplainMapSourceChain.html -%%DOCSDIR%%/ChamplainMapSourceFactory.html -%%DOCSDIR%%/ChamplainMarker.html -%%DOCSDIR%%/ChamplainMemoryCache.html -%%DOCSDIR%%/ChamplainMemphisRenderer.html -%%DOCSDIR%%/ChamplainNetworkBboxTileSource.html -%%DOCSDIR%%/ChamplainNetworkTileSource.html -%%DOCSDIR%%/ChamplainNullTileSource.html -%%DOCSDIR%%/ChamplainPolygon.html -%%DOCSDIR%%/ChamplainRenderer.html -%%DOCSDIR%%/ChamplainSelectionLayer.html -%%DOCSDIR%%/ChamplainTile.html -%%DOCSDIR%%/ChamplainTileCache.html -%%DOCSDIR%%/ChamplainTileSource.html -%%DOCSDIR%%/ChamplainView.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/ch03.html -%%DOCSDIR%%/ch04.html -%%DOCSDIR%%/ch05.html -%%DOCSDIR%%/ch06.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/ix01.html -%%DOCSDIR%%/ix02.html -%%DOCSDIR%%/ix03.html -%%DOCSDIR%%/ix04.html -%%DOCSDIR%%/ix05.html -%%DOCSDIR%%/ix06.html -%%DOCSDIR%%/ix07.html -%%DOCSDIR%%/left.png -%%DOCSDIR%%/libchamplain-ChamplainBoundingBox.html -%%DOCSDIR%%/libchamplain-ChamplainMapSourceDesc.html -%%DOCSDIR%%/libchamplain-ChamplainPoint.html -%%DOCSDIR%%/libchamplain-ChamplainVersion.html -%%DOCSDIR%%/libchamplain.devhelp -%%DOCSDIR%%/libchamplain.devhelp2 -%%DOCSDIR%%/pt01.html -%%DOCSDIR%%/pt02.html -%%DOCSDIR%%/pt03.html -%%DOCSDIR%%/pt04.html -%%DOCSDIR%%/pt05.html -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png +%%PORTDOCS%%%%DOCSDIRGTK%%/GtkChamplainEmbed.html +%%PORTDOCS%%%%DOCSDIRGTK%%/home.png +%%PORTDOCS%%%%DOCSDIRGTK%%/index.html +%%PORTDOCS%%%%DOCSDIRGTK%%/index.sgml +%%PORTDOCS%%%%DOCSDIRGTK%%/left.png +%%PORTDOCS%%%%DOCSDIRGTK%%/libchamplain-gtk.devhelp +%%PORTDOCS%%%%DOCSDIRGTK%%/libchamplain-gtk.devhelp2 +%%PORTDOCS%%%%DOCSDIRGTK%%/pt01.html +%%PORTDOCS%%%%DOCSDIRGTK%%/right.png +%%PORTDOCS%%%%DOCSDIRGTK%%/style.css +%%PORTDOCS%%%%DOCSDIRGTK%%/up.png +%%PORTDOCS%%%%DOCSDIR%%/ChamplainBaseMarker.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainErrorTileRenderer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainFileCache.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainFileTileSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainImageRenderer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainLayer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMapSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMapSourceChain.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMapSourceFactory.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMarker.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMemoryCache.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainMemphisRenderer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainNetworkBboxTileSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainNetworkTileSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainNullTileSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainPolygon.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainRenderer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainSelectionLayer.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainTile.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainTileCache.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainTileSource.html +%%PORTDOCS%%%%DOCSDIR%%/ChamplainView.html +%%PORTDOCS%%%%DOCSDIR%%/ch01.html +%%PORTDOCS%%%%DOCSDIR%%/ch02.html +%%PORTDOCS%%%%DOCSDIR%%/ch03.html +%%PORTDOCS%%%%DOCSDIR%%/ch04.html +%%PORTDOCS%%%%DOCSDIR%%/ch05.html +%%PORTDOCS%%%%DOCSDIR%%/ch06.html +%%PORTDOCS%%%%DOCSDIR%%/home.png +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/index.sgml +%%PORTDOCS%%%%DOCSDIR%%/ix01.html +%%PORTDOCS%%%%DOCSDIR%%/ix02.html +%%PORTDOCS%%%%DOCSDIR%%/ix03.html +%%PORTDOCS%%%%DOCSDIR%%/ix04.html +%%PORTDOCS%%%%DOCSDIR%%/ix05.html +%%PORTDOCS%%%%DOCSDIR%%/ix06.html +%%PORTDOCS%%%%DOCSDIR%%/ix07.html +%%PORTDOCS%%%%DOCSDIR%%/left.png +%%PORTDOCS%%%%DOCSDIR%%/libchamplain-ChamplainBoundingBox.html +%%PORTDOCS%%%%DOCSDIR%%/libchamplain-ChamplainMapSourceDesc.html +%%PORTDOCS%%%%DOCSDIR%%/libchamplain-ChamplainPoint.html +%%PORTDOCS%%%%DOCSDIR%%/libchamplain-ChamplainVersion.html +%%PORTDOCS%%%%DOCSDIR%%/libchamplain.devhelp +%%PORTDOCS%%%%DOCSDIR%%/libchamplain.devhelp2 +%%PORTDOCS%%%%DOCSDIR%%/pt01.html +%%PORTDOCS%%%%DOCSDIR%%/pt02.html +%%PORTDOCS%%%%DOCSDIR%%/pt03.html +%%PORTDOCS%%%%DOCSDIR%%/pt04.html +%%PORTDOCS%%%%DOCSDIR%%/pt05.html +%%PORTDOCS%%%%DOCSDIR%%/right.png +%%PORTDOCS%%%%DOCSDIR%%/style.css +%%PORTDOCS%%%%DOCSDIR%%/up.png share/gir-1.0/Champlain-%%VERSION%%.gir share/gir-1.0/GtkChamplain-%%VERSION%%.gir share/vala/vapi/champlain-%%VERSION%%.deps
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507280240.t6S2eHq5045713>