Date: Wed, 5 Jul 2000 11:54:28 +0200 (CEST) From: cj@vallcom.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/19708: Update port: irc/bitchx Message-ID: <200007050954.LAA08684@214.norrgarden.se>
next in thread | raw e-mail | index | archive | help
>Number: 19708
>Category: ports
>Synopsis: Update port: irc/bitchx
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 05 03:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Carl Johan Madestrand
>Release: FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
>Description:
* Make it so you can optionally build the plugins to save some space
and some time compiling (perhaps not everyone wants to run AIM or napster with their IRC client)
* Might aswell put all of the default config.h stuff into patch-aj, no point in having
#define WANT_CHAN_NICK_SERV in the Makefile
Remove patch-ai
Add patch-aj
NOTE: Please Close ports/19700, due to a mistake I accidentaly marked it as Class: sw-bug.
Not sure if a resubmission is neccesary but doing that just in case.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/irc/bitchx/Makefile bitchx/Makefile
--- /usr/ports/irc/bitchx/Makefile Tue Jul 4 10:20:51 2000
+++ bitchx/Makefile Tue Jul 4 20:35:50 2000
@@ -27,9 +27,14 @@
USE_AUTOCONF= yes
USE_GMAKE= yes
.if defined(WITH_GNOME)
-CONFIGURE_ARGS+= --with-plugins --with-gtk --enable-sound
+CONFIGURE_ARGS+= --with-gtk --enable-sound
.else
-CONFIGURE_ARGS+= --with-plugins --without-gtk
+CONFIGURE_ARGS+= --without-gtk
+.endif
+.if defined(WITH_PLUGINS)
+CONFIGURE_ARGS+= --with-plugins
+.else
+CONFIGURE_ARGS+= --without-plugins
.endif
CONFIGURE_ARGS+= --exec-prefix="${PREFIX}/share" \
--bindir="${PREFIX}/bin" \
@@ -46,11 +51,9 @@
.if !defined(WITH_GNOME)
pre-extract:
@${ECHO} "You can add hooks for GNOME by defining WITH_GNOME"
+ @${ECHO} "If you want to build the plugins define WITH_PLUGINS"
.endif
-pre-patch:
- @${PERL} -pi -e "s!#undef WANT_CHAN_NICK_SERV!#define WANT_CHAN_NICK_SERV!" ${WRKSRC}/include/config.h
-
post-install:
.if !defined(NOPORTDOCS)
${MKDIR} ${PREFIX}/share/bx/help
@@ -62,6 +65,24 @@
@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
@${ECHO} bin/gtkBitchX-1.0c16 >> ${TMPPLIST}
@${ECHO} share/bx/plugins/nicklist.so >> ${TMPPLIST}
+.if defined(WITH_PLUGINS)
+ @${ECHO} share/bx/plugins/BitchX.hints >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/acro.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/amp.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/autobot.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/blowfish.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/encrypt.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/fserv.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/hint.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/nap.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/pkga.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/possum.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/qmail.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/scan.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/wavplay.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/qbx.so >> ${TMPPLIST}
+ @${ECHO} share/bx/plugins/plugins >> ${TMPPLIST}
+.endif
.else
@${ECHO} bin/BitchX >> ${TMPPLIST}
@${ECHO} bin/BitchX-1.0c16 >> ${TMPPLIST}
@@ -69,7 +90,6 @@
@${ECHO} share/bx/wserv >> ${TMPPLIST}
.endif
@${ECHO} @dirrm share/bx/help >> ${TMPPLIST}
- @${ECHO} @dirrm share/bx/plugins >> ${TMPPLIST}
@${ECHO} @dirrm share/bx/script >> ${TMPPLIST}
@${ECHO} @dirrm share/bx/translation >> ${TMPPLIST}
@${ECHO} @dirrm share/bx >> ${TMPPLIST}
diff -urN /usr/ports/irc/bitchx/patches/patch-ai bitchx/patches/patch-ai
--- /usr/ports/irc/bitchx/patches/patch-ai Fri Mar 31 23:23:39 2000
+++ bitchx/patches/patch-ai Thu Jan 1 01:00:00 1970
@@ -1,23 +0,0 @@
---- include/config.h.bitchx.is.stupid Fri Mar 31 16:11:46 2000
-+++ include/config.h Fri Mar 31 16:16:06 2000
-@@ -460,7 +460,7 @@
-
- #define DEFAULT_HTTP_GRAB OFF
- #define DEFAULT_HELP_WINDOW OFF
--#define DEFAULT_NICK_COMPLETION ON
-+#define DEFAULT_NICK_COMPLETION OFF
- #define DEFAULT_NICK_COMPLETION_LEN 2
- #define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */
- #define DEFAULT_NOTIFY ON
-@@ -495,9 +495,9 @@
- #define DEFAULT_AINV 0
- #define DEFAULT_ANNOY_KICK OFF
- #define DEFAULT_AOP_VAR OFF
--#define DEFAULT_AUTO_AWAY ON
-+#define DEFAULT_AUTO_AWAY OFF
- #define DEFAULT_KICK_OPS ON
--#define DEFAULT_AUTO_REJOIN ON
-+#define DEFAULT_AUTO_REJOIN OFF
- #define DEFAULT_DEOPFLOOD ON
- #define DEFAULT_CTCP_FLOOD_AFTER 3
- #define DEFAULT_CTCP_FLOOD_RATE 10
diff -urN /usr/ports/irc/bitchx/patches/patch-aj bitchx/patches/patch-aj
--- /usr/ports/irc/bitchx/patches/patch-aj Thu Jan 1 01:00:00 1970
+++ bitchx/patches/patch-aj Tue Jul 4 20:34:33 2000
@@ -0,0 +1,33 @@
+--- include/config.h.orig Tue Jul 4 20:27:01 2000
++++ include/config.h Tue Jul 4 20:33:03 2000
+@@ -460,7 +460,7 @@
+
+ #define DEFAULT_HTTP_GRAB OFF
+ #define DEFAULT_HELP_WINDOW OFF
+-#define DEFAULT_NICK_COMPLETION ON
++#define DEFAULT_NICK_COMPLETION OFF
+ #define DEFAULT_NICK_COMPLETION_LEN 2
+ #define DEFAULT_NICK_COMPLETION_TYPE 0 /* 0 1 2 */
+ #define DEFAULT_NOTIFY ON
+@@ -495,9 +495,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
+ #define DEFAULT_CTCP_FLOOD_AFTER 3
+ #define DEFAULT_CTCP_FLOOD_RATE 10
+@@ -735,7 +735,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
diff -urN /usr/ports/irc/bitchx/pkg/PLIST bitchx/pkg/PLIST
--- /usr/ports/irc/bitchx/pkg/PLIST Sat Jan 29 22:54:28 2000
+++ bitchx/pkg/PLIST Tue Jul 4 18:38:55 2000
@@ -898,21 +898,6 @@
share/bx/help/8_Scripts/2.8script
share/bx/help/8_Scripts/window
share/bx/help/README_FIRST
-share/bx/plugins/BitchX.hints
-share/bx/plugins/acro.so
-share/bx/plugins/amp.so
-share/bx/plugins/autobot.so
-share/bx/plugins/blowfish.so
-share/bx/plugins/encrypt.so
-share/bx/plugins/fserv.so
-share/bx/plugins/hint.so
-share/bx/plugins/nap.so
-share/bx/plugins/pkga.so
-share/bx/plugins/possum.so
-share/bx/plugins/qmail.so
-share/bx/plugins/scan.so
-share/bx/plugins/wavplay.so
-share/bx/plugins/qbx.so
share/bx/script/actplug.gmz
share/bx/script/bxglobal
share/bx/script/bxtcl.tcl
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200007050954.LAA08684>