Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Sep 2015 15:52:54 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r398222 - in head: . databases/mysql-workbench52 textproc textproc/ctemplate textproc/google-ctemplate textproc/pecl-ctemplate
Message-ID:  <201509301552.t8UFqsvL067547@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Wed Sep 30 15:52:53 2015
New Revision: 398222
URL: https://svnweb.freebsd.org/changeset/ports/398222

Log:
  Rename ctemplate back to google-ctemplate, due package conflict.

Added:
  head/textproc/google-ctemplate/
     - copied from r398218, head/textproc/ctemplate/
Deleted:
  head/textproc/ctemplate/
Modified:
  head/MOVED
  head/databases/mysql-workbench52/Makefile
  head/textproc/Makefile
  head/textproc/google-ctemplate/Makefile
  head/textproc/pecl-ctemplate/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Sep 30 15:43:55 2015	(r398221)
+++ head/MOVED	Wed Sep 30 15:52:53 2015	(r398222)
@@ -7889,3 +7889,4 @@ net/linc||2015-09-27|Has expired: Last r
 net/linc-reference||2015-09-27|Has expired: Last release in 2003, not used by anything anymore.
 x11/xlogout||2015-09-27|Has expired: Useless cruft from 1989
 textproc/google-ctemplate|textproc/ctemplate|2015-09-29|Renamed
+textproc/ctemplate|textproc/google-ctemplate|2015-09-30|Renamed, due package conflict.

Modified: head/databases/mysql-workbench52/Makefile
==============================================================================
--- head/databases/mysql-workbench52/Makefile	Wed Sep 30 15:43:55 2015	(r398221)
+++ head/databases/mysql-workbench52/Makefile	Wed Sep 30 15:52:53 2015	(r398222)
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libzip.so:${PORTSDIR}/archi
 		libcairo.so:${PORTSDIR}/graphics/cairo \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libctemplate.so:${PORTSDIR}/textproc/ctemplate \
+		libctemplate.so:${PORTSDIR}/textproc/google-ctemplate \
 		libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
 		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Wed Sep 30 15:43:55 2015	(r398221)
+++ head/textproc/Makefile	Wed Sep 30 15:52:53 2015	(r398222)
@@ -96,7 +96,6 @@
     SUBDIR += csb-aspell
     SUBDIR += csv2latex
     SUBDIR += csvdiff
-    SUBDIR += ctemplate
     SUBDIR += ctpl
     SUBDIR += ctpp2
     SUBDIR += cwtext
@@ -216,6 +215,7 @@
     SUBDIR += go-text
     SUBDIR += go.text
     SUBDIR += goldendict
+    SUBDIR += google-ctemplate
     SUBDIR += google-translate-cli
     SUBDIR += gpp
     SUBDIR += grap

Modified: head/textproc/google-ctemplate/Makefile
==============================================================================
--- head/textproc/ctemplate/Makefile	Wed Sep 30 15:18:06 2015	(r398218)
+++ head/textproc/google-ctemplate/Makefile	Wed Sep 30 15:52:53 2015	(r398222)
@@ -4,6 +4,7 @@
 PORTNAME=	ctemplate
 PORTVERSION=	2.3
 CATEGORIES=	textproc
+PKGNAMEPREFIX=	google-
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Simple but powerful template language for C++

Modified: head/textproc/pecl-ctemplate/Makefile
==============================================================================
--- head/textproc/pecl-ctemplate/Makefile	Wed Sep 30 15:43:55 2015	(r398221)
+++ head/textproc/pecl-ctemplate/Makefile	Wed Sep 30 15:52:53 2015	(r398222)
@@ -11,7 +11,7 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	PECL extension for ctemplate library
 
-LIB_DEPENDS=	libctemplate.so:${PORTSDIR}/textproc/ctemplate
+LIB_DEPENDS=	libctemplate.so:${PORTSDIR}/textproc/google-ctemplate
 
 USES=		tar:xz
 USE_PHP=	yes



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