svn commit: r327440 - in head/irc/hexchat: . files

Rusmir Dusko nemysis at FreeBSD.org
Mon Sep 16 20:55:04 UTC 2013 

Author: nemysis
Date: Mon Sep 16 20:55:03 2013
New Revision: 327440
URL: http://svnweb.freebsd.org/changeset/ports/327440

Log:
  - Update to 2.9.6.1
  - Change maintainer email gmx.ch --> FreeBSD.org
  - USES gmake desktop-file-utils pkgconfig
  - Use the new format for LIB_DEPENDS
  - Change CONFIGURE_ARGS
  - Add DOCS and FISHLIM Options
  - Remove OPENSSL Option, use --enable-openssl
  - Remove OPENSSL from default Options
  - Reword Options description
  - Add dependencies for audio/libcanberra and textproc/en-aspell
  - Simplify Option handling
  - Change REINPLACE_CMD that not install for Gnome3 hexchat.appdata.xml
  - Mute dir install
  - Remove unneeded patches
  
  Removed file(s):
  - files/patch-configure.ac
  - files/patch-src-fe-gtk-Makefile.am
  - files/patch-src-fe-gtk-banlist.c
  - files/patch-src-fe-gtk-custom-list.h
  - files/patch-src-fe-gtk-fe-gtk.c
  - files/patch-src__common__dbus__dbus-client.c
  
  Approved by:	wg/pawel (mentors)

Deleted:
  head/irc/hexchat/files/
Modified:
  head/irc/hexchat/Makefile
  head/irc/hexchat/distinfo
  head/irc/hexchat/pkg-plist

Modified: head/irc/hexchat/Makefile
==============================================================================
--- head/irc/hexchat/Makefile	Mon Sep 16 20:30:42 2013	(r327439)
+++ head/irc/hexchat/Makefile	Mon Sep 16 20:55:03 2013	(r327440)
@@ -2,23 +2,25 @@
 # $FreeBSD$
 
 PORTNAME=	hexchat
-PORTVERSION=	2.9.5
+PORTVERSION=	2.9.6.1
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://dl.hexchat.org/${PORTNAME}/
 
-MAINTAINER=	nemysis at gmx.ch
+MAINTAINER=	nemysis at FreeBSD.org
 COMMENT=	IRC chat program with GTK and Text Frontend
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	proxy:${PORTSDIR}/net/libproxy
+LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy \
+		libcanberra.so:${PORTSDIR}/audio/libcanberra
 
 USE_XZ=		yes
-USES=		desktop-file-utils pathfix pkgconfig gmake
+USES=		gmake desktop-file-utils pkgconfig
 USE_GNOME=	gtk20 libxml2
 USE_AUTOTOOLS=	automake autoconf libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-gtkfe --disable-sysinfo
+CONFIGURE_ARGS+=--enable-openssl --enable-gtkfe --disable-sysinfo \
+		--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 INSTALLS_ICONS=	yes
 
 LDFLAGS+=	-pthread
@@ -27,138 +29,92 @@ MAN1=		hexchat.1
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		NLS SOCKS XFT OPENSSL TEXTFE PYTHON PERL DOAT DBUS NOTIFY
+OPTIONS_DEFINE=		DOCS NLS SOCKS XFT TEXTFE PYTHON PERL DOAT FISHLIM DBUS NOTIFY
 
 OPTIONS_RADIO=		SPELL
 OPTIONS_RADIO_SPELL=	LIBSEXY GTKSPELL STATIC
 
-OPTIONS_DEFAULT=	SOCKS XFT OPENSSL PERL DOAT DBUS NOTIFY LIBSEXY
+OPTIONS_DEFAULT=	SOCKS XFT PERL DOAT DBUS NOTIFY LIBSEXY
 
-TEXTFE_DESC=		Build the Text frontend
-DOAT_DESC=		Build the Do At plugin
+OPTIONS_SUB=	yes
+
+TEXTFE_DESC=		Text frontend
+DOAT_DESC=		Do At plugin
+FISHLIM_DESC=		FiSHLiM plugin
 STATIC_DESC=		Spell checking embedded in the binary
-LIBSEXY_DESC=		Spell checking through Libsexy
-GTKSPELL_DESC=		Spell checking through GTKSpell
+LIBSEXY_DESC=		Spell checking support via Libsexy
+GTKSPELL_DESC=		Spell checking support via GTKSpell
 
-.include <bsd.port.options.mk>
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+LIBSEXY_LIB_DEPENDS=	libsexy.so:${PORTSDIR}/x11-toolkits/libsexy
+GTKSPELL_LIB_DEPENDS=	libgtkspell.so:${PORTSDIR}/textproc/gtkspell
+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
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MLIBSEXY} && ! ${PORT_OPTIONS:MGTKSPELL} && ! ${PORT_OPTIONS:MSTATIC}
 CONFIGURE_ARGS+=--enable-spell=none
 .endif
 
+.if ${PORT_OPTIONS:MLIBSEXY} || ${PORT_OPTIONS:MGTKSPELL} || ${PORT_OPTIONS:MSTATIC}
+RUN_DEPENDS+=	aspell:${PORTSDIR}/textproc/en-aspell
+.endif
+
 .if ${PORT_OPTIONS:MSTATIC}
 CONFIGURE_ARGS+=--enable-spell=static
 .endif
 
 .if ${PORT_OPTIONS:MLIBSEXY}
-LIB_DEPENDS+=	sexy:${PORTSDIR}/x11-toolkits/libsexy
 CONFIGURE_ARGS+=--enable-spell=libsexy
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
-LIB_DEPENDS+=	gtkspell:${PORTSDIR}/textproc/gtkspell
 CONFIGURE_ARGS+=--enable-spell=gtkspell
 .endif
 
-.if ${PORT_OPTIONS:MSOCKS}
-LIB_DEPENDS+=	socks:${PORTSDIR}/net/dante
-CONFIGURE_ARGS+=--enable-socks
-.else
-CONFIGURE_ARGS+=--disable-socks
-.endif
-
 .if ${PORT_OPTIONS:MXFT}
 USE_XORG+=	xft
-CONFIGURE_ARGS+=--enable-xft
-.else
-CONFIGURE_ARGS+=--disable-xft
-.endif
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+=--enable-openssl
-PLIST_SUB+=	OPENSSL=""
-.else
-CONFIGURE_ARGS+=--disable-openssl
-
-PLIST_SUB+=	OPENSSL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTEXTFE}
-CONFIGURE_ARGS+=--enable-textfe
-PLIST_SUB+=	TEXTFE=""
-.else
-CONFIGURE_ARGS+=--disable-textfe
-PLIST_SUB+=	TEXTFE="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
-CONFIGURE_ARGS+=--enable-python
-PLIST_SUB+=	PYTHON=""
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=		perl5
-CONFIGURE_ARGS+=--enable-perl
-PLIST_SUB+=	PERL=""
-.else
-CONFIGURE_ARGS+=--disable-perl
-PLIST_SUB+=	PERL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOAT}
-CONFIGURE_ARGS+=--enable-doat
-PLIST_SUB+=	DOAT=""
-.else
-CONFIGURE_ARGS+=--disable-doat
-PLIST_SUB+=	DOAT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
 USE_GNOME+=	gconf2
-GCONF_SCHEMAS+=	apps_hexchat_url_handler.schemas
-PLIST_SUB+=	DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNOTIFY}
-RUN_DEPENDS+=	notify-send:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-libnotify
-PLIST_SUB+=	NOTIFY=""
-.else
-CONFIGURE_ARGS+=--disable-libnotify
-PLIST_SUB+=	NOTIFY="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' ${WRKSRC}/autogen.sh
-	@${REINPLACE_CMD} -e 's|po intl|po|g' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/^appdata_DATA/s|hexchat.appdata.xml||' \
+		 ${WRKSRC}/share/misc/Makefile.am ${WRKSRC}/share/misc/Makefile.in
 
 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 ${PREFIX}/share/pixmaps/
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/share/doc/*.md ${DOCSDIR}
 .endif
-	@(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a)
+#	@(cd ${PREFIX}/lib/hexchat/plugins/ && ${RM} -f *.a)
 
 .include <bsd.port.mk>

Modified: head/irc/hexchat/distinfo
==============================================================================
--- head/irc/hexchat/distinfo	Mon Sep 16 20:30:42 2013	(r327439)
+++ head/irc/hexchat/distinfo	Mon Sep 16 20:55:03 2013	(r327440)
@@ -1,2 +1,2 @@
-SHA256 (hexchat-2.9.5.tar.xz) = 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d
-SIZE (hexchat-2.9.5.tar.xz) = 1309112
+SHA256 (hexchat-2.9.6.1.tar.xz) = 6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470
+SIZE (hexchat-2.9.6.1.tar.xz) = 1768392

Modified: head/irc/hexchat/pkg-plist
==============================================================================
--- head/irc/hexchat/pkg-plist	Mon Sep 16 20:30:42 2013	(r327439)
+++ head/irc/hexchat/pkg-plist	Mon Sep 16 20:55:03 2013	(r327440)
@@ -1,16 +1,17 @@
 bin/hexchat
 %%TEXTFE%%bin/hexchat-text
 include/hexchat-plugin.h
-%%OPENSSL%%lib/hexchat/plugins/checksum.la
-%%OPENSSL%%lib/hexchat/plugins/checksum.so
+lib/hexchat/plugins/checksum.la
+lib/hexchat/plugins/checksum.so
 %%DOAT%%lib/hexchat/plugins/doat.la
 %%DOAT%%lib/hexchat/plugins/doat.so
-%%OPENSSL%%lib/hexchat/plugins/fishlim.la
-%%OPENSSL%%lib/hexchat/plugins/fishlim.so
+%%FISHLIM%%lib/hexchat/plugins/fishlim.la
+%%FISHLIM%%lib/hexchat/plugins/fishlim.so
 %%PERL%%lib/hexchat/plugins/perl.la
 %%PERL%%lib/hexchat/plugins/perl.so
 %%PYTHON%%lib/hexchat/plugins/python.la
 %%PYTHON%%lib/hexchat/plugins/python.so
+libdata/pkgconfig/hexchat-plugin.pc
 share/applications/hexchat.desktop
 %%DBUS%%share/dbus-1/services/org.hexchat.service.service
 share/icons/hicolor/48x48/apps/hexchat.png

More information about the svn-ports-all mailing list