From owner-svn-ports-all@FreeBSD.ORG Fri Oct 4 21:59:15 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0E654928; Fri, 4 Oct 2013 21:59:15 +0000 (UTC) (envelope-from nemysis@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0F3D293C; Fri, 4 Oct 2013 21:59:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r94LxEqx002229; Fri, 4 Oct 2013 21:59:14 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r94LxEOp002227; Fri, 4 Oct 2013 21:59:14 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201310042159.r94LxEOp002227@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 4 Oct 2013 21:59:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329395 - head/irc/hexchat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 21:59:15 -0000 Author: nemysis Date: Fri Oct 4 21:59:14 2013 New Revision: 329395 URL: http://svnweb.freebsd.org/changeset/ports/329395 Log: - Bump PORTREVISION for dependency change - Remove audio/libcanberra from default install - Reordering Options - Add CANBERRA Option - Add CANBERRA and PYTHON to default Options - Support STAGEDIR Approved by: wg/pawel (mentors) Modified: head/irc/hexchat/Makefile head/irc/hexchat/pkg-plist Modified: head/irc/hexchat/Makefile ============================================================================== --- head/irc/hexchat/Makefile Fri Oct 4 21:54:54 2013 (r329394) +++ head/irc/hexchat/Makefile Fri Oct 4 21:59:14 2013 (r329395) @@ -3,7 +3,7 @@ PORTNAME= hexchat PORTVERSION= 2.9.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc gnome ipv6 MASTER_SITES= http://dl.hexchat.org/${PORTNAME}/ @@ -12,8 +12,7 @@ COMMENT= IRC chat program with GTK and T LICENSE= GPLv2 -LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy \ - libcanberra.so:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= libproxy.so:${PORTSDIR}/net/libproxy USE_XZ= yes USES= gmake desktop-file-utils pkgconfig @@ -26,62 +25,62 @@ INSTALLS_ICONS= yes LDFLAGS+= -pthread -MAN1= hexchat.1 - SUB_FILES= pkg-message PORTDOCS= * -OPTIONS_DEFINE= DOCS NLS SOCKS XFT TEXTFE PYTHON PERL DOAT FISHLIM DBUS NOTIFY +OPTIONS_DEFINE= CANBERRA DBUS DOAT DOCS FISHLIM NLS NOTIFY PERL PYTHON SOCKS TEXTFE XFT OPTIONS_RADIO= SPELL -OPTIONS_RADIO_SPELL= LIBSEXY GTKSPELL STATIC +OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY STATIC -OPTIONS_DEFAULT= SOCKS XFT PERL DOAT DBUS NOTIFY LIBSEXY +OPTIONS_DEFAULT= CANBERRA DBUS NOTIFY LIBSEXY PERL PYTHON SOCKS XFT OPTIONS_SUB= yes -TEXTFE_DESC= Text frontend +CANBERRA_DESC= Audio support via Libcanberra DOAT_DESC= Do At plugin +GTKSPELL_DESC= Spell checking support via GTKSpell FISHLIM_DESC= FiSHLiM plugin -STATIC_DESC= Spell checking embedded in the binary LIBSEXY_DESC= Spell checking support via Libsexy -GTKSPELL_DESC= Spell checking support via GTKSpell +STATIC_DESC= Spell checking embedded in the binary +TEXTFE_DESC= Text frontend +CANBERRA_LIB_DEPENDS= libcanberra.so:${PORTSDIR}/audio/libcanberra +CANBERRA_CONFIGURE_ENABLE= libcanberra +DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +DBUS_CONFIGURE_ENABLE= dbus +DOAT_CONFIGURE_ENABLE= doat +FISHLIM_CONFIGURE_ENABLE= fishlim NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy -GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell +NOTIFY_RUN_DEPENDS= notify-send:${PORTSDIR}/devel/libnotify +NOTIFY_CONFIGURE_ENABLE= libnotify +PERL_CONFIGURE_ENABLE= perl +PYTHON_CONFIGURE_ENABLE= python SOCKS_LIB_DEPENDS= libsocks.so:${PORTSDIR}/net/dante SOCKS_CONFIGURE_ENABLE= socks -XFT_CONFIGURE_ENABLE= xft TEXTFE_CONFIGURE_ENABLE= textfe -PYTHON_CONFIGURE_ENABLE= python -PERL_CONFIGURE_ENABLE= perl -DOAT_CONFIGURE_ENABLE= doat -FISHLIM_CONFIGURE_ENABLE= fishlim -DBUS_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -DBUS_CONFIGURE_ENABLE= dbus -NOTIFY_RUN_DEPENDS= notify-send:${PORTSDIR}/devel/libnotify -NOTIFY_CONFIGURE_ENABLE= libnotify +XFT_CONFIGURE_ENABLE= xft +GTKSPELL_LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell +LIBSEXY_LIB_DEPENDS= libsexy.so:${PORTSDIR}/x11-toolkits/libsexy -NO_STAGE= yes .include -.if ! ${PORT_OPTIONS:MLIBSEXY} && ! ${PORT_OPTIONS:MGTKSPELL} && ! ${PORT_OPTIONS:MSTATIC} +.if ! ${PORT_OPTIONS:MGTKSPELL} && ! ${PORT_OPTIONS:MLIBSEXY} && ! ${PORT_OPTIONS:MSTATIC} CONFIGURE_ARGS+=--enable-spell=none .endif -.if ${PORT_OPTIONS:MSTATIC} -CONFIGURE_ARGS+=--enable-spell=static +.if ${PORT_OPTIONS:MGTKSPELL} +CONFIGURE_ARGS+=--enable-spell=gtkspell .endif .if ${PORT_OPTIONS:MLIBSEXY} CONFIGURE_ARGS+=--enable-spell=libsexy .endif -.if ${PORT_OPTIONS:MGTKSPELL} -CONFIGURE_ARGS+=--enable-spell=gtkspell +.if ${PORT_OPTIONS:MSTATIC} +CONFIGURE_ARGS+=--enable-spell=static .endif .if ${PORT_OPTIONS:MXFT} @@ -109,16 +108,12 @@ pre-configure: @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh) post-install: - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/share/doc/*.md ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/share/doc/*.md ${STAGEDIR}${DOCSDIR} .endif # @(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a) - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include Modified: head/irc/hexchat/pkg-plist ============================================================================== --- head/irc/hexchat/pkg-plist Fri Oct 4 21:54:54 2013 (r329394) +++ head/irc/hexchat/pkg-plist Fri Oct 4 21:59:14 2013 (r329395) @@ -12,6 +12,7 @@ lib/hexchat/plugins/checksum.so %%PYTHON%%lib/hexchat/plugins/python.la %%PYTHON%%lib/hexchat/plugins/python.so libdata/pkgconfig/hexchat-plugin.pc +man/man1/hexchat.1.gz share/applications/hexchat.desktop %%DBUS%%share/dbus-1/services/org.hexchat.service.service share/icons/hicolor/48x48/apps/hexchat.png