Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 Jan 2015 13:13:59 +0000 (UTC)
From:      Johannes Jost Meixner <xmj@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378116 - in head/irc/bitchx: . files
Message-ID:  <201501291313.t0TDDxEm015623@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: xmj
Date: Thu Jan 29 13:13:59 2015
New Revision: 378116
URL: https://svnweb.freebsd.org/changeset/ports/378116
QAT: https://qat.redports.org/buildarchive/r378116/

Log:
  irc/bitchx: update to 1.2.1
  
  - update to 1.2.1
  - use OPTIONS helpers
  - remove unnecessary Perl depencency
  - remove unnecessary GCC dependency
  - Add support for hebrew language (as option)
  - Add helpful toggles (as option
  - Kill files/ directory
  
  PR:		195526
  Differential Revision:	https://reviews.freebsd.org/D1710
  Submitted by:	Chris Petrik <chris@bsdjunk.com>
  Approved by:	koobs (mentor)

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

Modified: head/irc/bitchx/Makefile
==============================================================================
--- head/irc/bitchx/Makefile	Thu Jan 29 13:12:53 2015	(r378115)
+++ head/irc/bitchx/Makefile	Thu Jan 29 13:13:59 2015	(r378116)
@@ -1,21 +1,17 @@
 # Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
 # $FreeBSD$
 
-PORTNAME=	BitchX
-DISTVERSION=	1.2-final
-PORTREVISION?=	3
+PORTNAME=	bitchx
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES+=	irc
-MASTER_SITES=	http://bitchx.ca/
+MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
 
-MAINTAINER?=	dan.mashal@gmail.com
-# Co-maintainer: Chris Petrik <c.petrik.sosa@gmail.com> (PR/181627)
-COMMENT?=	Feature-rich scriptable IRC client
+MAINTAINER=	dan.mashal@gmail.com
+# Co-maintainer: Chris Petrik <chris@bsdjunk.com> (PR/181627)
+COMMENT=	Feature-rich scriptable IRC client
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C,-final$,,}
-
-USES=		gmake perl5
-USE_GCC=	yes # PR: 186425
+USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
 		--bindir="${PREFIX}/bin" \
@@ -23,61 +19,56 @@ CONFIGURE_ARGS+=--exec-prefix="${PREFIX}
 		--libdir="${PREFIX}/share"
 LIBS+=		-L${LOCALBASE}/lib
 
+OPTIONS_SUB=	yes
+
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 DOCSDIR=	${PREFIX}/share/bx/help
 PORTDOCS=	*
 DATADIR=	${PREFIX}/share/bx
 
-OPTIONS_DEFINE=	IPV6 LATIN PLUGINS SSL DOCS
+OPTIONS_DEFINE=	DOCS HEBREW IPV6 LATIN PLUGINS SSL TOGGLES
 
 LATIN_DESC=	Recommended for ISO-8859-1 display
 PLUGINS_DESC=	Build a handful of BitchX plugins
-
-OPTIONS_DEFAULT=PLUGINS SSL
+HEBREW_DESC=	Add support for hebrew language
+TOGGLES_DESC=	Disable away,kick_ops,auto_rejoin
+OPTIONS_DEFAULT=	PLUGINS SSL
 
 MAKE_JOBS_UNSAFE=	yes
-.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+IPV6_CONFIGURE_ENABLE=	ipv6
 
-.if ${PORT_OPTIONS:MSSL}
-CONFIGURE_ARGS+=	--with-ssl
-USE_OPENSSL=		yes
-.endif
+SSL_CONFIGURE_WITH=	ssl
+SSL_USE=	openssl=yes
 
-.if ${PORT_OPTIONS:MPLUGINS}
-PLUGINS=	abot acro aim arcfour autocycle blowfish cavlink cdrom encrypt \
-		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
-PLIST_SUB+=	PLUGINS=""
-.else
-PLIST_SUB+=	PLUGINS="@comment "
-.endif
+PLUGINS_CONFIGURE_WITH=		plugins="${PLUGIN_LIST:C/\$$/,/g}"
 
-.if !empty(PLUGINS)
-CONFIGURE_ARGS+=	--with-plugins="${PLUGINS:C/\$$/,/g}"
-.else
-CONFIGURE_ARGS+=	--without-plugins
-.endif
+PLUGIN_LIST=	abot acro aim arcfour autocycle blowfish cavlink cdrom encrypt \
+		europa fserv hint nap nicklist pkga possum qbx qmail wavplay
+.include <bsd.port.options.mk>
 
 post-patch:
 .if ${PORT_OPTIONS:MLATIN}
 	${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \
 		${WRKSRC}/include/config.h
 .endif
+.if ${PORT_OPTIONS:MHEBREW}
+	${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \
+		${WRKSRC}/include/config.h
+.endif
+.if ${PORT_OPTIONS:MTOGGLES}
+	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_AWAY ON|DEFAULT_AUTO_AWAY OFF|' \
+		${WRKSRC}/include/config.h
+	${REINPLACE_CMD} -e 's|DEFAULT_KICK_OPS ON|DEFAULT_KICK_OPS OFF|' \
+		${WRKSRC}/include/config.h
+	${REINPLACE_CMD} -e 's|DEFAULT_AUTO_REJOIN ON|DEFAULT_AUTO_REJOIN OFF|' \
+		${WRKSRC}/include/config.h
+.endif
 	${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/BitchX
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/scr-bx
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 .endif
 
-# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
-add-plist-post:
-	@${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST}
-
 .include <bsd.port.mk>

Modified: head/irc/bitchx/distinfo
==============================================================================
--- head/irc/bitchx/distinfo	Thu Jan 29 13:12:53 2015	(r378115)
+++ head/irc/bitchx/distinfo	Thu Jan 29 13:13:59 2015	(r378116)
@@ -1,2 +1,2 @@
-SHA256 (BitchX-1.2-final.tar.gz) = 7058d4be640c881fe91cbda6701b271c47846e0d3d7a13b52a3a36948094ec36
-SIZE (BitchX-1.2-final.tar.gz) = 2609717
+SHA256 (bitchx-1.2.1.tar.gz) = 2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
+SIZE (bitchx-1.2.1.tar.gz) = 2549182

Modified: head/irc/bitchx/pkg-plist
==============================================================================
--- head/irc/bitchx/pkg-plist	Thu Jan 29 13:12:53 2015	(r378115)
+++ head/irc/bitchx/pkg-plist	Thu Jan 29 13:13:59 2015	(r378116)
@@ -7,6 +7,7 @@ man/man1/BitchX.1.gz
 %%DATADIR%%/BitchX.ircnames
 %%DATADIR%%/BitchX.quit
 %%DATADIR%%/BitchX.kick
+@dir %%DATADIR%%/plugins
 %%PLUGINS%%%%DATADIR%%/plugins/BitchX.hints
 %%PLUGINS%%%%DATADIR%%/plugins/acro.so
 %%PLUGINS%%%%DATADIR%%/plugins/aim.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501291313.t0TDDxEm015623>