- Update to 20130507 (0.4.1-rc1)

3 files changed, 21 insertions, 6 deletions

diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index a46941dd70f1..7f9101b35b53 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	weechat
-PORTVERSION=	20130301
-PORTREVISION=	1
+PORTVERSION=	20130508
 CATEGORIES=	irc
 MASTER_SITES=	http://perturb.me.uk/distfiles/ \
 		${MASTER_SITE_LOCAL}
@@ -26,7 +25,7 @@ WANT_PERL=	yes
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl \
 		gcrypt:${PORTSDIR}/security/libgcrypt
 
-GITDESC=	v0.4.0-85-g11396b3
+GITDESC=	v0.4.1-rc1-12-gc6fdeaf
 GITREV!=	echo "${GITDESC}" | sed -E 's/^.*-g(.{7})$$/\1/'
 #GITREV=	01a1316
 WRKSRC=	${WRKDIR}/${PORTNAME}-${GITREV}
@@ -35,7 +34,8 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${GITREV}
 # bsd.cmake.mk to set the cmake build type to Debug instead of
 # Release.
 
-OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL GNUTLS NLS DOCUMENTATION COLOR256
+OPTIONS_DEFINE=	RUBY PYTHON PERL TCL LUA CHARSET BACKTRACE DEBUG ASPELL \
+		GNUTLS NLS DOCUMENTATION COLOR256 ICON
 OPTIONS_DEFAULT=CHARSET BACKTRACE DEBUG
 
 BACKTRACE_DESC=	Provide crash backtraces
@@ -47,6 +47,7 @@ PYTHON_DESC=	Python scripting support
 RUBY_DESC=	Ruby scripting support
 TCL_DESC=	Tcl scripting support
 COLOR256_DESC=	Use ncurses port for 256 color support
+ICON_DESC=	Desktop icon
 
 .include <bsd.port.options.mk>
 
@@ -150,6 +151,12 @@ CMAKE_ARGS+=	-DNCURSES_INCLUDE_PATH=${LOCALBASE}/include/ncurses
 USES+=		ncurses
 .endif
 
+.if ${PORT_OPTIONS:MICON}
+PLIST_SUB+=	ICON=""
+.else
+PLIST_SUB+=	ICON="@comment "
+.endif
+
 MAN1=	weechat-curses.1
 
 post-patch:
@@ -162,6 +169,9 @@ post-patch:
 .if empty(PORT_OPTIONS:MBACKTRACE)
 	@${REINPLACE_CMD} -e '/IF.*FreeBSD/,/ENDIF.*FreeBSD/d' ${WRKSRC}/src/core/CMakeLists.txt
 .endif
+.if empty(PORT_OPTIONS:MICON)
+	@${REINPLACE_CMD} -e '/^# icon$$/,/^$$/d' ${WRKSRC}/CMakeLists.txt
+.endif
 
 pre-configure:
 .if ${PORT_OPTIONS:MCOLOR256}
diff --git a/irc/weechat-devel/distinfo b/irc/weechat-devel/distinfo
index 413056097a63..f80fcfd76981 100644
--- a/irc/weechat-devel/distinfo
+++ b/irc/weechat-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-devel-11396b3.tar.gz) = 83496774a81a8330412fae961d7548726c9a7ff77a618d6ff8c6de726a534f7e
-SIZE (weechat-devel-11396b3.tar.gz) = 2535683
+SHA256 (weechat-devel-c6fdeaf.tar.gz) = 7fd5fb5d5c7e93703cc73f880f85a8b496ffe60fbd867710dfcb65e7639202a3
+SIZE (weechat-devel-c6fdeaf.tar.gz) = 2566810
diff --git a/irc/weechat-devel/pkg-plist b/irc/weechat-devel/pkg-plist
index 50783bcccbf9..bff95097d82a 100644
--- a/irc/weechat-devel/pkg-plist
+++ b/irc/weechat-devel/pkg-plist
@@ -52,6 +52,7 @@ libdata/pkgconfig/weechat.pc
 %%DOCUMENTATION%%share/doc/weechat/weechat_user.fr.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_user.it.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_user.ja.html
+%%ICON%%share/icons/hicolor/32x32/apps/weechat.png
 %%NLS%%share/locale/cs/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/de/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/es/LC_MESSAGES/weechat.mo
@@ -65,4 +66,8 @@ libdata/pkgconfig/weechat.pc
 @dirrmtry lib/weechat/plugins
 @dirrmtry lib/weechat
 %%DOCUMENTATION%%@dirrmtry share/doc/weechat
+%%ICON%%@dirrmtry share/icons/hicolor/32x32/apps
+%%ICON%%@dirrmtry share/icons/hicolor/32x32
+%%ICON%%@dirrmtry share/icons/hicolor
+%%ICON%%@dirrmtry share/icons
 @dirrm include/weechat