diff options
| author | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-30 15:52:53 +0000 |
|---|---|---|
| committer | Vanilla I. Shu <vanilla@FreeBSD.org> | 2015-09-30 15:52:53 +0000 |
| commit | 379416f0a3f41c57fb0fde032a6487b974bbb3b7 (patch) | |
| tree | 13e349fa994169b4d7f3c0871a533acd6c0047ed | |
| parent | 824d6669e1b0ab20c3a9ff759b39e16844cd2148 (diff) | |
Notes
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | databases/mysql-workbench52/Makefile | 2 | ||||
| -rw-r--r-- | textproc/Makefile | 2 | ||||
| -rw-r--r-- | textproc/google-ctemplate/Makefile (renamed from textproc/ctemplate/Makefile) | 1 | ||||
| -rw-r--r-- | textproc/google-ctemplate/distinfo (renamed from textproc/ctemplate/distinfo) | 0 | ||||
| -rw-r--r-- | textproc/google-ctemplate/files/patch-src_base_small__map.h (renamed from textproc/ctemplate/files/patch-src_base_small__map.h) | 0 | ||||
| -rw-r--r-- | textproc/google-ctemplate/pkg-descr (renamed from textproc/ctemplate/pkg-descr) | 0 | ||||
| -rw-r--r-- | textproc/google-ctemplate/pkg-plist (renamed from textproc/ctemplate/pkg-plist) | 0 | ||||
| -rw-r--r-- | textproc/pecl-ctemplate/Makefile | 2 |
9 files changed, 5 insertions, 3 deletions
@@ -7889,3 +7889,4 @@ net/linc||2015-09-27|Has expired: Last release in 2003, not used by anything any 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. diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index 7918741bd904..4b7ee2a5ec82 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= libzip.so:${PORTSDIR}/archivers/libzip \ 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 \ diff --git a/textproc/Makefile b/textproc/Makefile index 75b53f0385ab..f7fab8ab9ad2 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -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 diff --git a/textproc/ctemplate/Makefile b/textproc/google-ctemplate/Makefile index f99ba7d117d8..f74813e131cc 100644 --- a/textproc/ctemplate/Makefile +++ b/textproc/google-ctemplate/Makefile @@ -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++ diff --git a/textproc/ctemplate/distinfo b/textproc/google-ctemplate/distinfo index 103eee6f93aa..103eee6f93aa 100644 --- a/textproc/ctemplate/distinfo +++ b/textproc/google-ctemplate/distinfo diff --git a/textproc/ctemplate/files/patch-src_base_small__map.h b/textproc/google-ctemplate/files/patch-src_base_small__map.h index 4f9352bbda37..4f9352bbda37 100644 --- a/textproc/ctemplate/files/patch-src_base_small__map.h +++ b/textproc/google-ctemplate/files/patch-src_base_small__map.h diff --git a/textproc/ctemplate/pkg-descr b/textproc/google-ctemplate/pkg-descr index 569d0c4f1b19..569d0c4f1b19 100644 --- a/textproc/ctemplate/pkg-descr +++ b/textproc/google-ctemplate/pkg-descr diff --git a/textproc/ctemplate/pkg-plist b/textproc/google-ctemplate/pkg-plist index b4a46b1c0ee2..b4a46b1c0ee2 100644 --- a/textproc/ctemplate/pkg-plist +++ b/textproc/google-ctemplate/pkg-plist diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile index b871059c6217..0992a68913ec 100644 --- a/textproc/pecl-ctemplate/Makefile +++ b/textproc/pecl-ctemplate/Makefile @@ -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 |