Index: head/irc/bitchx/files/patch-source-Makefile.in =================================================================== --- head/irc/bitchx/files/patch-source-Makefile.in (revision 378115) +++ head/irc/bitchx/files/patch-source-Makefile.in (nonexistent) @@ -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@ Property changes on: head/irc/bitchx/files/patch-source-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/bitchx/files/patch-include-config.h =================================================================== --- head/irc/bitchx/files/patch-include-config.h (revision 378115) +++ head/irc/bitchx/files/patch-include-config.h (nonexistent) @@ -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 Property changes on: head/irc/bitchx/files/patch-include-config.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/irc/bitchx/Makefile =================================================================== --- head/irc/bitchx/Makefile (revision 378115) +++ head/irc/bitchx/Makefile (revision 378116) @@ -1,83 +1,74 @@ # Created by: Jimbo Bahooli # $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 (PR/181627) -COMMENT?= Feature-rich scriptable IRC client +MAINTAINER= dan.mashal@gmail.com +# Co-maintainer: Chris Petrik (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" \ --datadir="${PREFIX}/share" \ --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 +HEBREW_DESC= Add support for hebrew language +TOGGLES_DESC= Disable away,kick_ops,auto_rejoin +OPTIONS_DEFAULT= PLUGINS SSL -OPTIONS_DEFAULT=PLUGINS SSL - MAKE_JOBS_UNSAFE= yes -.include -.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 \ +PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" + +PLUGIN_LIST= 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 +.include -.if !empty(PLUGINS) -CONFIGURE_ARGS+= --with-plugins="${PLUGINS:C/\$$/,/g}" -.else -CONFIGURE_ARGS+= --without-plugins -.endif - 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 Index: head/irc/bitchx/distinfo =================================================================== --- head/irc/bitchx/distinfo (revision 378115) +++ head/irc/bitchx/distinfo (revision 378116) @@ -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: head/irc/bitchx/pkg-plist =================================================================== --- head/irc/bitchx/pkg-plist (revision 378115) +++ head/irc/bitchx/pkg-plist (revision 378116) @@ -1,78 +1,79 @@ @unexec if [ -f %D/%%DATADIR%%/script/bxglobal.old ]; then rm -f %D/share/bx/script/bxglobal.old; fi bin/BitchX bin/BitchX-%%DISTVERSION%% bin/scr-bx man/man1/BitchX.1.gz %%DATADIR%%/BitchX.help %%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 %%PLUGINS%%%%DATADIR%%/plugins/autobot.so %%PLUGINS%%%%DATADIR%%/plugins/blowfish.so %%PLUGINS%%%%DATADIR%%/plugins/cavlink.so %%PLUGINS%%%%DATADIR%%/plugins/encrypt.so %%PLUGINS%%%%DATADIR%%/plugins/fserv.so %%PLUGINS%%%%DATADIR%%/plugins/hint.so %%PLUGINS%%%%DATADIR%%/plugins/nap.so %%PLUGINS%%%%DATADIR%%/plugins/pkga.so %%PLUGINS%%%%DATADIR%%/plugins/possum.so %%PLUGINS%%%%DATADIR%%/plugins/qmail.so %%PLUGINS%%%%DATADIR%%/plugins/wavplay.so %%PLUGINS%%%%DATADIR%%/plugins/qbx.so %%PLUGINS%%%%DATADIR%%/plugins/arcfour.so %%PLUGINS%%%%DATADIR%%/plugins/autocycle.so %%PLUGINS%%%%DATADIR%%/plugins/cdrom.so %%PLUGINS%%%%DATADIR%%/plugins/nicklist.so %%DATADIR%%/script/SCRIPTS %%DATADIR%%/script/actplug.gmz %%DATADIR%%/script/bxglobal %%DATADIR%%/script/bxtcl.tcl %%DATADIR%%/script/cyp1.0k.tar.gz %%DATADIR%%/script/dcc_fserve-0.50.tgz %%DATADIR%%/script/example-.bitchxrc %%DATADIR%%/script/file.tcl %%DATADIR%%/script/fserve+vfs.tar.gz %%DATADIR%%/script/logger.bx %%DATADIR%%/script/menu.bx %%DATADIR%%/script/operchallenge-1.3.tar %%DATADIR%%/script/query.bx %%DATADIR%%/script/auto_resume %%DATADIR%%/script/fserve.irc %%DATADIR%%/script/query %%DATADIR%%/translation/ASCII %%DATADIR%%/translation/CP437 %%DATADIR%%/translation/CP850 %%DATADIR%%/translation/DANISH %%DATADIR%%/translation/DEC_MCS %%DATADIR%%/translation/DG_MCS %%DATADIR%%/translation/DUTCH %%DATADIR%%/translation/FINNISH %%DATADIR%%/translation/FRENCH %%DATADIR%%/translation/FRENCH_CANADIAN %%DATADIR%%/translation/GERMAN %%DATADIR%%/translation/HP_MCS %%DATADIR%%/translation/IRV %%DATADIR%%/translation/ITALIAN %%DATADIR%%/translation/JIS %%DATADIR%%/translation/MACINTOSH %%DATADIR%%/translation/NEXT %%DATADIR%%/translation/NORWEGIAN_1 %%DATADIR%%/translation/NORWEGIAN_2 %%DATADIR%%/translation/POLISH %%DATADIR%%/translation/POLISH_NOPL %%DATADIR%%/translation/PORTUGUESE %%DATADIR%%/translation/PORTUGUESE_COM %%DATADIR%%/translation/RUSSIAN %%DATADIR%%/translation/RUSSIAN_ALT %%DATADIR%%/translation/RUSSIAN_WIN %%DATADIR%%/translation/SPANISH %%DATADIR%%/translation/SWEDISH %%DATADIR%%/translation/SWEDISH_NAMES %%DATADIR%%/translation/SWEDISH_NAMES_COM %%DATADIR%%/translation/SWISS %%DATADIR%%/translation/UNITED_KINGDOM %%DATADIR%%/translation/UNITED_KINGDOM_COM %%DATADIR%%/wserv