Drop the legacy weechat-curses symlink, I can't figure out the phase of

the moon it is created in. Bump revision.

4 files changed, 21 insertions, 7 deletions

diff --git a/chat/weechat/Makefile b/chat/weechat/Makefile
index 843145fa30a..bca05b8846d 100644
--- a/chat/weechat/Makefile
+++ b/chat/weechat/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2015/03/31 11:35:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2015/04/30 11:36:54 joerg Exp $
 
 DISTNAME=	weechat-1.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	http://www.weechat.org/files/src/
 
diff --git a/chat/weechat/PLIST b/chat/weechat/PLIST
index 82fbe046907..ebf05436b11 100644
--- a/chat/weechat/PLIST
+++ b/chat/weechat/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.19 2014/08/24 12:45:35 tonio Exp $
+@comment $NetBSD: PLIST,v 1.20 2015/04/30 11:36:54 joerg Exp $
 bin/weechat
-bin/weechat-curses
 include/weechat/weechat-plugin.h
 lib/pkgconfig/weechat.pc
 lib/weechat/plugins/alias.so
diff --git a/chat/weechat/distinfo b/chat/weechat/distinfo
index 7c66ae2083a..0050daa2fc5 100644
--- a/chat/weechat/distinfo
+++ b/chat/weechat/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.31 2014/11/30 02:10:43 markd Exp $
+$NetBSD: distinfo,v 1.32 2015/04/30 11:36:54 joerg Exp $
 
 SHA1 (weechat-1.0.tar.bz2) = d3070ffde05cb706d615144e71f933153871894d
 RMD160 (weechat-1.0.tar.bz2) = d36e7144884a0779b8242ac5e35f4e3c6379af65
 Size (weechat-1.0.tar.bz2) = 2275868 bytes
 SHA1 (patch-ab) = d0fac0994602dfa0afde9fe14487f44f8cce25d6
 SHA1 (patch-po_CMakeLists.txt) = d6b1fad4ec4026f319f19fb581af93a196f6e78b
-SHA1 (patch-src_gui_curses_CMakeLists_txt) = 3844df73b69fecadf42855ecc394b2e4f4e49dfd
+SHA1 (patch-src_gui_curses_CMakeLists_txt) = b96a789692e60c824e7f1d3a3fdd0c91d98d50ba
 SHA1 (patch-src_gui_curses_gui-curses-term_c) = d1a2d4f08c6df0007e2d6cb1771c889c7b2441c6
 SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
 SHA1 (patch-src_plugins_weechat-plugin.h) = 52971fbb702355993fc9f55bfec19bae177f4dcb
diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
index c59db9386e4..ab43059852a 100644
--- a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
+++ b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.3 2014/08/24 12:45:35 tonio Exp $
+$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.4 2015/04/30 11:36:54 joerg Exp $
 
 Test for ncursesw
 
@@ -28,3 +28,18 @@ Test for ncursesw
  list(APPEND EXTRA_LIBS "pthread")
  
  if(ICONV_LIBRARY)
+@@ -85,14 +91,3 @@ add_dependencies(${EXECUTABLE} weechat_g
+ target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} weechat_gui_curses ${EXTRA_LIBS} ${STATIC_LIBS})
+ 
+ install(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
+-
+-# Create a symbolic link weechat-curses -> weechat
+-# This link is created for compatibility with old versions on /upgrade.
+-# It may be removed in future.
+-install(CODE "
+-  EXECUTE_PROCESS(
+-    COMMAND ${CMAKE_COMMAND} -E remove -f \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\"
+-    COMMAND ${CMAKE_COMMAND} -E create_symlink weechat${CMAKE_EXECUTABLE_SUFFIX} \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\"
+-  )
+-  LIST(APPEND CMAKE_INSTALL_MANIFEST_FILES \"${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}\")
+-")