Attachment #152283 for bug #195526




# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
# $FreeBSD$

PORTNAME=	bitchx
DISTVERSION=	1.2.1
PORTREVISION?=	3
PORTEPOCH=	1
CATEGORIES+=	irc
MASTER_SITES=	SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}

MAINTAINER?=	dan.mashal@gmail.com
# Co-maintainer: Chris Petrik <chris@bsdjunk.com> (PR/181627)
COMMENT?=	Feature-rich scriptable IRC client

USES=		gmake

USES=		gmake perl5
USE_GCC=	yes # PR: 186425
GNU_CONFIGURE=	yes
CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
		--bindir="${PREFIX}/bin" \

PORTDOCS=	*
DATADIR=	${PREFIX}/share/bx

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

	${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}


# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
add-plist-post:
	@${ECHO_CMD} "@dir ${DATADIR_REL}" >> ${TMPPLIST}

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (BitchX-1.2-final.tar.gz) = 7058d4be640c881fe91cbda6701b271c47846e0d3d7a13b52a3a36948094ec36	1	SHA256 (bitchx-1.2.1.tar.gz) = 2d270500dd42b5e2b191980d584f6587ca8a0dbda26b35ce7fadb519f53c83e2
2	SIZE (BitchX-1.2-final.tar.gz) = 2609717	2	SIZE (bitchx-1.2.1.tar.gz) = 2549182




--- 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




--- 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@

Return to bug 195526

Lines 1-21 Link Here

(-)Makefile (-15 / +22 lines)
1	# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>	1	# Created by: Jimbo Bahooli <griffin@blackhole.iceworld.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= BitchX	4	PORTNAME= bitchx
5	DISTVERSION= 1.2-final	5	DISTVERSION= 1.2.1
6	PORTREVISION?= 3	6	PORTREVISION?= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES+= irc	8	CATEGORIES+= irc
9	MASTER_SITES= http://bitchx.ca/	9	MASTER_SITES= SF/${PORTNAME}/ircii-pana/${PORTNAME}-${DISTVERSION}
10		10
11	MAINTAINER?= dan.mashal@gmail.com	11	MAINTAINER?= dan.mashal@gmail.com
12	# Co-maintainer: Chris Petrik <c.petrik.sosa@gmail.com> (PR/181627)	12	# Co-maintainer: Chris Petrik <chris@bsdjunk.com> (PR/181627)
13	COMMENT?= Feature-rich scriptable IRC client	13	COMMENT?= Feature-rich scriptable IRC client
14		14
15	WRKSRC= ${WRKDIR}/${DISTNAME:C,-final$,,}	15	USES= gmake
16
17	USES= gmake perl5
18	USE_GCC= yes # PR: 186425
19	GNU_CONFIGURE= yes	16	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \	17	CONFIGURE_ARGS+=--exec-prefix="${PREFIX}/share" \
21	--bindir="${PREFIX}/bin" \	18	--bindir="${PREFIX}/bin" \
Lines 28-38 Link Here
28	PORTDOCS= *	25	PORTDOCS= *
29	DATADIR= ${PREFIX}/share/bx	26	DATADIR= ${PREFIX}/share/bx
30		27
31	OPTIONS_DEFINE= IPV6 LATIN PLUGINS SSL DOCS	28	OPTIONS_DEFINE= IPV6 LATIN PLUGINS SSL DOCS HEBREW TOGGLES
32		29
33	LATIN_DESC= Recommended for ISO-8859-1 display	30	LATIN_DESC= Recommended for ISO-8859-1 display
34	PLUGINS_DESC= Build a handful of BitchX plugins	31	PLUGINS_DESC= Build a handful of BitchX plugins
35		32	HEBREW_DESC= Add support for hebrew
		33	TOGGLES_DESC= Disable away,kick_ops,auto_rejoin
36	OPTIONS_DEFAULT=PLUGINS SSL	34	OPTIONS_DEFAULT=PLUGINS SSL
37		35
38	MAKE_JOBS_UNSAFE= yes	36	MAKE_JOBS_UNSAFE= yes
Lines 66-76 Link Here
66	${REINPLACE_CMD} -e 's\|#undef LATIN1\|#define LATIN1\|' \	64	${REINPLACE_CMD} -e 's\|#undef LATIN1\|#define LATIN1\|' \
67	${WRKSRC}/include/config.h	65	${WRKSRC}/include/config.h
68	.endif	66	.endif
		67	.if ${PORT_OPTIONS:MHEBREW}
		68	${REINPLACE_CMD} -e 's\|#undef WANT_HEBREW\|#define WANT_HEBREW\|' \
		69	${WRKSRC}/include/config.h
		70	.endif
		71	.if ${PORT_OPTIONS:MTOGGLES}
		72	${REINPLACE_CMD} -e 's\|DEFAULT_AUTO_AWAY ON\|DEFAULT_AUTO_AWAY OFF\|' \
		73	${WRKSRC}/include/config.h
		74	${REINPLACE_CMD} -e 's\|DEFAULT_KICK_OPS ON\|DEFAULT_KICK_OPS OFF\|' \
		75	${WRKSRC}/include/config.h
		76	${REINPLACE_CMD} -e 's\|DEFAULT_AUTO_REJOIN ON\|DEFAULT_AUTO_REJOIN OFF\|' \
		77	${WRKSRC}/include/config.h
		78	.endif
69	${REINPLACE_CMD} -e 's\|bzip2\|true\|g' ${WRKSRC}/Makefile.in	79	${REINPLACE_CMD} -e 's\|bzip2\|true\|g' ${WRKSRC}/Makefile.in
70		80
71	post-install:
72	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/BitchX
73	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/scr-bx
74	.if ${PORT_OPTIONS:MDOCS}	81	.if ${PORT_OPTIONS:MDOCS}
75	@${MKDIR} ${STAGEDIR}${DOCSDIR}	82	@${MKDIR} ${STAGEDIR}${DOCSDIR}
76	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}	83	cd ${WRKSRC}/bitchx-docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
Lines 78-83 Link Here
78		85
79	# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)	86	# Ensure that `@dirrm share/bx' will be appended last (after PORTDOCS stuff)
80	add-plist-post:	87	add-plist-post:
81	@${ECHO_CMD} "@dirrm ${DATADIR_REL}" >> ${TMPPLIST}	88	@${ECHO_CMD} "@dir ${DATADIR_REL}" >> ${TMPPLIST}
82		89
83	.include <bsd.port.mk>	90	.include <bsd.port.mk>

Lines 1-33 Link Here

(-)files/patch-include-config.h (-33 lines)
1	--- include/config.h.old Wed Mar 14 11:20:48 2001
2	+++ include/config.h Wed Mar 14 11:23:51 2001
3	@@ -225,7 +225,7 @@
4	* in the client. defining this variable to 1 allows that happen. It also
5	* adds a HEBREW_TOGGLE variable which can turn this feature on/off
6	*/
7	-#undef WANT_HEBREW
8	+#define WANT_HEBREW
9
10	/* if you use cidentd the filename is called .authlie instead of .noident.
11	* as well some modifications to the format of the file were made. So we
12	@@ -480,9 +480,9 @@
13	#define DEFAULT_AINV 0
14	#define DEFAULT_ANNOY_KICK OFF
15	#define DEFAULT_AOP_VAR OFF
16	-#define DEFAULT_AUTO_AWAY ON
17	-#define DEFAULT_KICK_OPS ON
18	-#define DEFAULT_AUTO_REJOIN ON
19	+#define DEFAULT_AUTO_AWAY OFF
20	+#define DEFAULT_KICK_OPS OFF
21	+#define DEFAULT_AUTO_REJOIN OFF
22	#define DEFAULT_DEOPFLOOD ON
23	#if defined(__EMXPM__) \|\| defined(WIN32)
24	#define DEFAULT_CODEPAGE 437
25	@@ -684,7 +684,7 @@
26	#endif
27
28	#undef PARANOID /* #define this if your paranoid about dcc hijacking */
29	-#undef WANT_CHAN_NICK_SERV /* do we want to include some chan/nick/oper server commands */
30	+#define WANT_CHAN_NICK_SERV /* do we want to include some chan/nick/oper server commands */
31
32	/* new epic stuff */
33	#define OLD_STATUS_S_EXPANDO_BEHAVIOR

Lines 1-19 Link Here

(-)files/patch-source-Makefile.in (-19 lines)
1	--- source/Makefile.in.orig Fri Apr 11 03:09:07 2003
2	+++ source/Makefile.in Tue Mar 30 14:44:20 2004
3	@@ -37,7 +37,7 @@
4	IRCLIB = @IRCLIB@
5
6	CC = @CC@
7	-DEFS = @INCLUDES@
8	+DEFS = @INCLUDES@ @CPPFLAGS@
9	LIBS = @LIBS@
10
11	# Tcl library.
12	@@ -51,6 +51,7 @@
13	# Set this to -g if you want to be able to debug the client, otherwise
14	# use -O to have the compiler do some optimization instead.
15	CFLAGS = @CFLAGS@
16	+CPPFLAGS= @CPPFLAGS@
17
18	# Set this to -s if you want the binary to be stripped.
19	LDFLAGS = @LDFLAGS@