Attachment 150059 Details for Bug 195526 – Updated patch file

[patch] Updated patch file

patch-bitchx-1.2.1.txt (text/plain), 5.13 KB, created by Anonymous on 2014-12-01 06:50:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymous

Created: 2014-12-01 06:50:23 UTC

Size: 5.13 KB

patch

obsolete

>Index: bitchx/Makefile
>===================================================================
>--- bitchx/Makefile	(revision 371750)
>+++ bitchx/Makefile	(working copy)
>@@ -2,20 +2,22 @@
> # $FreeBSD$
> 
> PORTNAME=	BitchX
>-DISTVERSION=	1.2-final
>+DISTVERSION=	1.2.1
> PORTREVISION?=	2
> PORTEPOCH=	1
> CATEGORIES+=	irc
>-MASTER_SITES=	http://bitchx.ca/
>+MASTER_SITES=	SF/${PORTNAME:tl}/ircii-pana/${PORTNAME:tl}-${DISTVERSION}
>+DISTFILES=	${PORTNAME:tl}-${DISTVERSION}.tar.gz
> 
> MAINTAINER?=	dan.mashal@gmail.com
>-# Co-maintainer: Chris Petrik <c.petrik.sosa@gmail.com> (PR/181627)
>+# dan possibly AFC
>+# Co-maintainer: Chris Petrik <chris@bsdjunk.com> (PR/181627)
> COMMENT?=	Feature-rich scriptable IRC client
> 
>-WRKSRC=		${WRKDIR}/${DISTNAME:C,-final$,,}
>+WRKSRC=		${WRKDIR}/${PORTNAME:tl}-${DISTVERSION}
> 
>-USES=		gmake perl5
>-USE_GCC=	yes # PR: 186425
>+USES=		gmake
>+#USE_GCC=	yes # PR: 186425
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
> 		--bindir="${PREFIX}/bin" \
>@@ -28,11 +30,12 @@
> PORTDOCS=	*
> DATADIR=	${PREFIX}/share/bx
> 
>-OPTIONS_DEFINE=	IPV6 LATIN PLUGINS SSL DOCS
>+OPTIONS_DEFINE=	IPV6 LATIN PLUGINS SSL DOCS HEBREW TOGGLES
> 
> LATIN_DESC=	Recommended for ISO-8859-1 display
> PLUGINS_DESC=	Build a handful of BitchX plugins
>-
>+HEBREW_DESC=	Add support for hebrew
>+TOGGLES_DESC=	Disable away,kick_ops,auto_rejoin
> OPTIONS_DEFAULT=PLUGINS SSL
> 
> MAKE_JOBS_UNSAFE=	yes
>@@ -65,11 +68,20 @@
> 	${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}
>@@ -77,6 +89,6 @@
> 
> # Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
> add-plist-post:
>-	@${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST}
>+	@${ECHO_CMD} "@dir ${DATADIR_REL}" >> ${TMPPLIST}
> 
> .include <bsd.port.mk>
>Index: bitchx/distinfo
>===================================================================
>--- bitchx/distinfo	(revision 371750)
>+++ bitchx/distinfo	(working copy)
>@@ -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
>Index: bitchx/files/patch-include-config.h
>===================================================================
>--- bitchx/files/patch-include-config.h	(revision 371750)
>+++ bitchx/files/patch-include-config.h	(working copy)
>@@ -1,33 +0,0 @@
>---- include/config.h.old	Wed Mar 14 11:20:48 2001
>-+++ include/config.h	Wed Mar 14 11:23:51 2001
>-@@ -225,7 +225,7 @@
>-  * in the client. defining this variable to 1 allows that happen. It also
>-  * adds a HEBREW_TOGGLE variable which can turn this feature on/off
>-  */
>--#undef WANT_HEBREW
>-+#define WANT_HEBREW
>- 
>- /* if you use cidentd the filename is called .authlie instead of .noident.
>-  * as well some modifications to the format of the file were made. So we 
>-@@ -480,9 +480,9 @@
>- #define DEFAULT_AINV 0
>- #define DEFAULT_ANNOY_KICK OFF
>- #define DEFAULT_AOP_VAR OFF
>--#define DEFAULT_AUTO_AWAY ON
>--#define DEFAULT_KICK_OPS ON
>--#define DEFAULT_AUTO_REJOIN ON
>-+#define DEFAULT_AUTO_AWAY OFF
>-+#define DEFAULT_KICK_OPS OFF
>-+#define DEFAULT_AUTO_REJOIN OFF
>- #define DEFAULT_DEOPFLOOD ON
>- #if defined(__EMXPM__) || defined(WIN32)
>- #define DEFAULT_CODEPAGE 437
>-@@ -684,7 +684,7 @@
>- #endif
>- 
>- #undef PARANOID		/* #define this if your paranoid about dcc hijacking */
>--#undef WANT_CHAN_NICK_SERV	/* do we want to include some chan/nick/oper server commands */
>-+#define WANT_CHAN_NICK_SERV	/* do we want to include some chan/nick/oper server commands */
>- 
>- /* new epic stuff */
>- #define OLD_STATUS_S_EXPANDO_BEHAVIOR
>Index: bitchx/files/patch-source-Makefile.in
>===================================================================
>--- bitchx/files/patch-source-Makefile.in	(revision 371750)
>+++ bitchx/files/patch-source-Makefile.in	(working copy)
>@@ -1,19 +0,0 @@
>---- source/Makefile.in.orig	Fri Apr 11 03:09:07 2003
>-+++ source/Makefile.in	Tue Mar 30 14:44:20 2004
>-@@ -37,7 +37,7 @@
>- IRCLIB = @IRCLIB@
>- 
>- CC = @CC@
>--DEFS = @INCLUDES@
>-+DEFS = @INCLUDES@ @CPPFLAGS@
>- LIBS = @LIBS@
>- 
>- # Tcl library.
>-@@ -51,6 +51,7 @@
>- # Set this to -g if you want to be able to debug the client, otherwise
>- # use -O to have the compiler do some optimization instead.
>- CFLAGS = @CFLAGS@
>-+CPPFLAGS= @CPPFLAGS@
>- 
>- # Set this to -s if you want the binary to be stripped.
>- LDFLAGS = @LDFLAGS@

Actions: View | Diff

Attachments on bug 195526: 150024 | 150059 | 152283 | 152310