From 1755441dc3c69ff9ddac338db43eedacd61e4e77 Mon Sep 17 00:00:00 2001 From: obache Date: Fri, 2 May 2014 11:17:08 +0000 Subject: shared_ptr renaming is not required now. --- inputmethod/ibus-pinyin/Makefile | 6 +----- inputmethod/ibus-pinyin/distinfo | 3 +-- inputmethod/ibus-pinyin/patches/patch-src_PYUtil.h | 15 --------------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 inputmethod/ibus-pinyin/patches/patch-src_PYUtil.h diff --git a/inputmethod/ibus-pinyin/Makefile b/inputmethod/ibus-pinyin/Makefile index a2da7f750df..3177db62838 100644 --- a/inputmethod/ibus-pinyin/Makefile +++ b/inputmethod/ibus-pinyin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2014/04/09 07:27:09 obache Exp $ +# $NetBSD: Makefile,v 1.24 2014/05/02 11:17:08 obache Exp $ # DISTNAME= ibus-pinyin-1.5.0 @@ -35,10 +35,6 @@ CONFIGURE_ARGS+= --disable-boost CONFIGURE_ARGS+= --enable-boost CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-headers} .include "../../devel/boost-headers/buildlink3.mk" -SUBST_CLASSES+= shared_ptr -SUBST_STAGE.shared_ptr= post-configure -SUBST_FILES.shared_ptr= src/*.h -SUBST_SED.shared_ptr= -e 's,std::shared_ptr,boost::shared_ptr,g' .endif .include "../../inputmethod/ibus/bad-env-usage.mk" diff --git a/inputmethod/ibus-pinyin/distinfo b/inputmethod/ibus-pinyin/distinfo index 0173438cd01..c8b4c39d19c 100644 --- a/inputmethod/ibus-pinyin/distinfo +++ b/inputmethod/ibus-pinyin/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.5 2013/10/30 11:30:36 obache Exp $ +$NetBSD: distinfo,v 1.6 2014/05/02 11:17:08 obache Exp $ SHA1 (ibus-pinyin-1.5.0.tar.gz) = 40abf915bb2599189d8fd76f456ce399edfa4184 RMD160 (ibus-pinyin-1.5.0.tar.gz) = 9137f3e40971bd819fbaaf1715779a538d20a90c Size (ibus-pinyin-1.5.0.tar.gz) = 692516 bytes SHA1 (patch-lua_lmyoslib.c) = 7934c67df6134085f5a429ad678e1bfa89c65be8 SHA1 (patch-lua_lua-plugin.h) = 51fbb077a8f0c528101dbdaafcbac9702dde334f -SHA1 (patch-src_PYUtil.h) = 93e289e83abaec2fef6cd5a7cf924cd3bb6a20ad diff --git a/inputmethod/ibus-pinyin/patches/patch-src_PYUtil.h b/inputmethod/ibus-pinyin/patches/patch-src_PYUtil.h deleted file mode 100644 index 845c92b9f7e..00000000000 --- a/inputmethod/ibus-pinyin/patches/patch-src_PYUtil.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_PYUtil.h,v 1.1 2012/04/22 14:02:50 obache Exp $ - -* error `already defined' on NetBSD-5.1.2. - ---- src/PYUtil.h.orig 2011-09-17 02:43:37.000000000 +0000 -+++ src/PYUtil.h -@@ -43,7 +43,7 @@ - - namespace std { - // import boost::shared_ptr to std namespace -- using boost::shared_ptr; -+ // using boost::shared_ptr; - // import boost::scoped_ptr to std namespace, and rename to unique_ptr - // XXX: the unique_ptr can transfer the pointer ownership, - // but scoped_ptr cannot. -- cgit v1.2.3