Implement WANT_GNOME.

8 files changed, 401 insertions, 507 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index d7734f2d33fb..f74895dd4348 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -13,71 +13,62 @@ MASTER_SITES=	ftp://ftp.bitchx.com/pub/BitchX/source/ \
 
 MAINTAINER=	cj@vallcom.net
 
-.if defined(WITH_GNOME)
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if defined(WITH_TCL)
-BUILD_DEPENDS=	${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
-.endif
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 WRKSRC=		${WRKDIR}/BitchX
+
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=	--with-gtk
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
+CONFIGURE_ARGS=	--exec-prefix="${PREFIX}/share" \
+		--bindir="${PREFIX}/bin" \
+		--datadir="${PREFIX}/share" \
+		--libdir="${PREFIX}/share"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L{LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--with-gtk
 .else
-CONFIGURE_ARGS+=	--without-gtk
+CONFIGURE_ARGS+=--without-gtk
 .endif
-.if defined(WITH_TCL)
-CONFIGURE_ARGS+=	--with-tcl \
-			--with-tcl-includes="${PREFIX}/include/tcl8.3" \
-			--with-tcl-libs="${PREFIX}/lib"
+.if defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+CONFIGURE_ARGS+=--enable-sound
 .endif
-.if defined(WITH_ESD)
-CONFIGURE_ARGS+=	--enable-sound
+
+.if defined(WITH_TCL)
+BUILD_DEPENDS+=	${LOCALBASE}/include/tcl8.3/tcl.h:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=--with-tcl \
+		--with-tcl-includes=/usr/local/include/tcl8.3 \
+		--with-tcl-libs=/usr/local/lib
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3"
+post-extract:
+	@uudecode -p ${FILESDIR}/tcl-freebsd.o.uu > ${WRKSRC}/source/tcl.o
 .endif
+
 .if defined(WITH_PLUGINS)
-CONFIGURE_ARGS+=	--with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx
+CONFIGURE_ARGS+=--with-plugins=pkga,possum,encrypt,hint,abot,acro,amp,blowfish,scan,wavplay,qmail,fserv,nap,qbx
+PLIST_SUB+=	PLUGINS:=""
 .else
-CONFIGURE_ARGS+=	--without-plugins
+CONFIGURE_ARGS+=--without-plugins
+PLIST_SUB+=	PLUGINS:="@comment "
 .endif
-CONFIGURE_ARGS+=	--exec-prefix="${PREFIX}/share"	\
-			--bindir="${PREFIX}/bin" \
-			--datadir="${PREFIX}/share" \
-			--libdir="${PREFIX}/share"
 
-.if defined(WITH_TCL)
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.3"
-.else
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
+.if defined(WITH_LATIN)
+pre-patch:
+	@${PERL} -pi -e "s!#undef LATIN1!#define LATIN1!" ${WRKSRC}/include/config.h
 .endif
-CONFIGURE_ENV+= GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}"
-
-MAKE_ENV+=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_DATA="${INSTALL_DATA}"
 
 pre-extract:
 	@${ECHO} "Available switches:"
 	@${ECHO} "-------------------"
-	@${ECHO} "WITH_GNOME - Build GTK BitchX"
-	@${ECHO} "WITH_ESD - Build GTK BitchX with ESD sound support"
 	@${ECHO} "WITH_PLUGINS - Build the plugins"
 	@${ECHO} "WITH_LATIN - Recommended if you are using an ISO-8859-1 display"
 	@${ECHO} "WITH_TCL - Build BitchX with TCL scripting"
 
-.if defined(WITH_TCL)
-post-extract:
-	@uudecode -p ${FILESDIR}/tcl-freebsd.o.uu > ${WRKSRC}/source/tcl.o
-.endif
-
-.if defined(WITH_LATIN)
-pre-patch:
-	@${PERL} -pi -e "s!#undef LATIN1!#define LATIN1!" ${WRKSRC}/include/config.h
-.endif
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/bx/help
@@ -87,36 +78,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/bxfaq.html ${PREFIX}/share/doc/bitchx
 .endif
 
-.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} @dirrm share/bx/plugins >> ${TMPPLIST}
-.endif
-.if defined(WITH_GNOME)
-	@${ECHO} bin/gtkBitchX >> ${TMPPLIST}
-	@${ECHO} bin/gtkBitchX-1.0c17 >> ${TMPPLIST}
-.else
-	@${ECHO} bin/BitchX >> ${TMPPLIST}
-	@${ECHO} bin/BitchX-1.0c17 >> ${TMPPLIST}
-	@${ECHO} bin/scr-bx >> ${TMPPLIST}
-	@${ECHO} share/bx/wserv >> ${TMPPLIST}
-.endif
-	@${ECHO} @dirrm share/bx/help >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx/script >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx/translation >> ${TMPPLIST}
-	@${ECHO} @dirrm share/bx >> ${TMPPLIST}
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/bitchx/files/patch-ag b/irc/bitchx/files/patch-ag
index 1868a7405c07..2d65fcf13bfa 100644
--- a/irc/bitchx/files/patch-ag
+++ b/irc/bitchx/files/patch-ag
@@ -1,21 +1,22 @@
-*** Makefile.in.orig	Sun Jan 23 03:30:33 2000
---- Makefile.in	Sun Jan 23 03:30:56 2000
-***************
-*** 90,97 ****
-  
-  # This command will be used to install the BitchX help files.  If you don't
-  # want to install them, replace with the following:
-! # INSTALL_HELP_CMD = @echo The help files have not been installed.
-! INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
-  
-  # This program allows you to use screen/xterm's to put new BitchX windows
-  # on new screen/xterm windows.
---- 90,97 ----
-  
-  # This command will be used to install the BitchX help files.  If you don't
-  # want to install them, replace with the following:
-! INSTALL_HELP_CMD = @echo 
-! # INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
-  
-  # This program allows you to use screen/xterm's to put new BitchX windows
-  # on new screen/xterm windows.
+--- Makefile.in.orig	Sun Jan  9 02:11:01 2000
++++ Makefile.in	Sat Sep  9 01:24:46 2000
+@@ -43,7 +43,7 @@
+ IRCLIB = @IRCLIB@
+ 
+ CC = @CC@
+-DEFS = -I$$(srcdir)/../include -I$(topdir)/include
++DEFS = -I$$(srcdir)/../include -I$(topdir)/include -I. -I-
+ LIBS = @LIBS@
+ INCLUDES = @INCLUDES@
+ 
+@@ -90,8 +90,8 @@
+ 
+ # This command will be used to install the BitchX help files.  If you don't
+ # want to install them, replace with the following:
+-# INSTALL_HELP_CMD = @echo The help files have not been installed.
+-INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
++INSTALL_HELP_CMD = @echo 
++# INSTALL_HELP_CMD = cp -pr $(srcdir)/bitchx-docs/* $(HELPDIR)
+ 
+ # This program allows you to use screen/xterm's to put new BitchX windows
+ # on new screen/xterm windows.
diff --git a/irc/bitchx/pkg-plist b/irc/bitchx/pkg-plist
index 16e55977c1c5..4170d9e5f18e 100644
--- a/irc/bitchx/pkg-plist
+++ b/irc/bitchx/pkg-plist
@@ -1,133 +1,139 @@
-share/bx/BitchX.quit
+%%NOGNOME:%%bin/BitchX
+%%NOGNOME:%%bin/BitchX-1.0c17
+%%GNOME:%%bin/gtkBitchX
+%%GNOME:%%bin/gtkBitchX-1.0c17
+%%NOGNOME:%%bin/scr-bx
+share/bx/BitchX.help
 share/bx/BitchX.ircnames
+share/bx/BitchX.quit
 share/bx/BitchX.reasons
-share/bx/BitchX.help
-share/bx/help/1_General/l
+share/bx/help/1_General/1_General
+share/bx/help/1_General/4op
+share/bx/help/1_General/about
+share/bx/help/1_General/addforward
+share/bx/help/1_General/addidle
+share/bx/help/1_General/addlamenick
+share/bx/help/1_General/addnoflood
+share/bx/help/1_General/addshit
 share/bx/help/1_General/adduser
+share/bx/help/1_General/addword
+share/bx/help/1_General/ajoin
+share/bx/help/1_General/ajoinlist
 share/bx/help/1_General/away
+share/bx/help/1_General/awaylog
+share/bx/help/1_General/awaymsg
+share/bx/help/1_General/b
+share/bx/help/1_General/back
+share/bx/help/1_General/ban
+share/bx/help/1_General/banstat
+share/bx/help/1_General/bantype
+share/bx/help/1_General/banwords
+share/bx/help/1_General/bk
+share/bx/help/1_General/bki
 share/bx/help/1_General/bye
 share/bx/help/1_General/channel
+share/bx/help/1_General/chat
+share/bx/help/1_General/ctcp/action
+share/bx/help/1_General/ctcp/bdcc
+share/bx/help/1_General/ctcp/cdcc
+share/bx/help/1_General/ctcp/clientinfo
+share/bx/help/1_General/ctcp/ctcp
+share/bx/help/1_General/ctcp/echo
+share/bx/help/1_General/ctcp/finger
+share/bx/help/1_General/ctcp/ident
+share/bx/help/1_General/ctcp/invite
+share/bx/help/1_General/ctcp/op
+share/bx/help/1_General/ctcp/ops
+share/bx/help/1_General/ctcp/ping
+share/bx/help/1_General/ctcp/time
+share/bx/help/1_General/ctcp/unban
+share/bx/help/1_General/ctcp/uptime
+share/bx/help/1_General/ctcp/userinfo
+share/bx/help/1_General/ctcp/utc
+share/bx/help/1_General/ctcp/version
+share/bx/help/1_General/ctcp/whoami
+share/bx/help/1_General/ctcp/xdcc
+share/bx/help/1_General/dcc/activecount
+share/bx/help/1_General/dcc/autoget
+share/bx/help/1_General/dcc/autooverwrite
+share/bx/help/1_General/dcc/autorename
+share/bx/help/1_General/dcc/bot
+share/bx/help/1_General/dcc/chat
+share/bx/help/1_General/dcc/close
+share/bx/help/1_General/dcc/closeall
+share/bx/help/1_General/dcc/dcc
+share/bx/help/1_General/dcc/exempt
+share/bx/help/1_General/dcc/ftp
+share/bx/help/1_General/dcc/get
+share/bx/help/1_General/dcc/list
+share/bx/help/1_General/dcc/quietmode
+share/bx/help/1_General/dcc/raw
+share/bx/help/1_General/dcc/reget
+share/bx/help/1_General/dcc/rename
+share/bx/help/1_General/dcc/resend
+share/bx/help/1_General/dcc/resume
+share/bx/help/1_General/dcc/send
+share/bx/help/1_General/dcc/showpaths
+share/bx/help/1_General/dcc/stats
+share/bx/help/1_General/dcc/tget
+share/bx/help/1_General/dcc/treget
+share/bx/help/1_General/dcc/tresend
+share/bx/help/1_General/dcc/tsend
 share/bx/help/1_General/describe
 share/bx/help/1_General/disconnect
+share/bx/help/1_General/gone
 share/bx/help/1_General/help
 share/bx/help/1_General/ignore
 share/bx/help/1_General/invite
+share/bx/help/1_General/j
 share/bx/help/1_General/join
+share/bx/help/1_General/k
+share/bx/help/1_General/kb
+share/bx/help/1_General/kbi
 share/bx/help/1_General/kick
+share/bx/help/1_General/kickidle
+share/bx/help/1_General/l
+share/bx/help/1_General/lamenicklist
 share/bx/help/1_General/lastlog
+share/bx/help/1_General/leave
+share/bx/help/1_General/m
 share/bx/help/1_General/me
 share/bx/help/1_General/mode
 share/bx/help/1_General/msg
 share/bx/help/1_General/nick
+share/bx/help/1_General/nochat
 share/bx/help/1_General/noforward
 share/bx/help/1_General/notice
 share/bx/help/1_General/notify
 share/bx/help/1_General/nslookup
+share/bx/help/1_General/offers
+share/bx/help/1_General/p
 share/bx/help/1_General/part
+share/bx/help/1_General/partall
 share/bx/help/1_General/ping
 share/bx/help/1_General/query
 share/bx/help/1_General/quit
 share/bx/help/1_General/reconnect
 share/bx/help/1_General/say
 share/bx/help/1_General/server
-share/bx/help/1_General/url
+share/bx/help/1_General/shitlist
+share/bx/help/1_General/showwordkick
 share/bx/help/1_General/silence
 share/bx/help/1_General/spam
+share/bx/help/1_General/t
 share/bx/help/1_General/topic
+share/bx/help/1_General/unajoin
 share/bx/help/1_General/unforward
 share/bx/help/1_General/unidle
-share/bx/help/1_General/unuser
-share/bx/help/1_General/1_General
-share/bx/help/1_General/4op
-share/bx/help/1_General/about
-share/bx/help/1_General/addforward
-share/bx/help/1_General/addidle
-share/bx/help/1_General/uping
-share/bx/help/1_General/offers
-share/bx/help/1_General/k
-share/bx/help/1_General/ver
-share/bx/help/1_General/j
-share/bx/help/1_General/kb
-share/bx/help/1_General/kbi
-share/bx/help/1_General/kickidle
-share/bx/help/1_General/m
-share/bx/help/1_General/chat
-share/bx/help/1_General/addshit
-share/bx/help/1_General/nochat
-share/bx/help/1_General/addlamenick
-share/bx/help/1_General/lamenicklist
 share/bx/help/1_General/unlamenick
 share/bx/help/1_General/unshit
-share/bx/help/1_General/shitlist
-share/bx/help/1_General/addword
+share/bx/help/1_General/unuser
 share/bx/help/1_General/unwordkick
-share/bx/help/1_General/bki
-share/bx/help/1_General/ajoin
-share/bx/help/1_General/ajoinlist
-share/bx/help/1_General/unajoin
-share/bx/help/1_General/ban
-share/bx/help/1_General/showwordkick
-share/bx/help/1_General/banstat
-share/bx/help/1_General/bantype
-share/bx/help/1_General/banwords
-share/bx/help/1_General/b
-share/bx/help/1_General/bk
-share/bx/help/1_General/awaylog
-share/bx/help/1_General/awaymsg
-share/bx/help/1_General/gone
-share/bx/help/1_General/back
-share/bx/help/1_General/partall
-share/bx/help/1_General/leave
-share/bx/help/1_General/p
-share/bx/help/1_General/t
+share/bx/help/1_General/uping
+share/bx/help/1_General/url
+share/bx/help/1_General/ver
 share/bx/help/1_General/wordlist
-share/bx/help/1_General/addnoflood
-share/bx/help/1_General/dcc/close
-share/bx/help/1_General/dcc/closeall
-share/bx/help/1_General/dcc/dcc
-share/bx/help/1_General/dcc/get
-share/bx/help/1_General/dcc/list
-share/bx/help/1_General/dcc/raw
-share/bx/help/1_General/dcc/rename
-share/bx/help/1_General/dcc/resume
-share/bx/help/1_General/dcc/chat
-share/bx/help/1_General/dcc/send
-share/bx/help/1_General/dcc/resend
-share/bx/help/1_General/dcc/reget
-share/bx/help/1_General/dcc/tsend
-share/bx/help/1_General/dcc/tresend
-share/bx/help/1_General/dcc/tget
-share/bx/help/1_General/dcc/treget
-share/bx/help/1_General/dcc/ftp
-share/bx/help/1_General/dcc/activecount
-share/bx/help/1_General/dcc/quietmode
-share/bx/help/1_General/dcc/showpaths
-share/bx/help/1_General/dcc/autorename
-share/bx/help/1_General/dcc/autooverwrite
-share/bx/help/1_General/dcc/autoget
-share/bx/help/1_General/dcc/stats
-share/bx/help/1_General/dcc/exempt
-share/bx/help/1_General/dcc/bot
-share/bx/help/1_General/ctcp/bdcc
-share/bx/help/1_General/ctcp/cdcc
-share/bx/help/1_General/ctcp/clientinfo
-share/bx/help/1_General/ctcp/ctcp
-share/bx/help/1_General/ctcp/echo
-share/bx/help/1_General/ctcp/finger
-share/bx/help/1_General/ctcp/ident
-share/bx/help/1_General/ctcp/invite
-share/bx/help/1_General/ctcp/op
-share/bx/help/1_General/ctcp/ops
-share/bx/help/1_General/ctcp/ping
-share/bx/help/1_General/ctcp/time
-share/bx/help/1_General/ctcp/unban
-share/bx/help/1_General/ctcp/uptime
-share/bx/help/1_General/ctcp/userinfo
-share/bx/help/1_General/ctcp/utc
-share/bx/help/1_General/ctcp/version
-share/bx/help/1_General/ctcp/whoami
-share/bx/help/1_General/ctcp/action
-share/bx/help/1_General/ctcp/xdcc
+share/bx/help/2_Queries/2_Queries
 share/bx/help/2_Queries/admin
 share/bx/help/2_Queries/flush
 share/bx/help/2_Queries/info
@@ -137,7 +143,16 @@ share/bx/help/2_Queries/list
 share/bx/help/2_Queries/lusers
 share/bx/help/2_Queries/map
 share/bx/help/2_Queries/motd
+share/bx/help/2_Queries/n
 share/bx/help/2_Queries/names
+share/bx/help/2_Queries/sc
+share/bx/help/2_Queries/scan
+share/bx/help/2_Queries/scanf
+share/bx/help/2_Queries/scani
+share/bx/help/2_Queries/scann
+share/bx/help/2_Queries/scano
+share/bx/help/2_Queries/scans
+share/bx/help/2_Queries/scanv
 share/bx/help/2_Queries/stats
 share/bx/help/2_Queries/time
 share/bx/help/2_Queries/trace
@@ -147,46 +162,40 @@ share/bx/help/2_Queries/users
 share/bx/help/2_Queries/version
 share/bx/help/2_Queries/who
 share/bx/help/2_Queries/whois
-share/bx/help/2_Queries/2_Queries
 share/bx/help/2_Queries/whowas
+share/bx/help/2_Queries/wi
 share/bx/help/2_Queries/wii
-share/bx/help/2_Queries/ww
 share/bx/help/2_Queries/wilc
+share/bx/help/2_Queries/wilcr
 share/bx/help/2_Queries/wilm
 share/bx/help/2_Queries/wiln
-share/bx/help/2_Queries/wilcr
-share/bx/help/2_Queries/sc
-share/bx/help/2_Queries/n
-share/bx/help/2_Queries/scan
-share/bx/help/2_Queries/wi
-share/bx/help/2_Queries/scani
-share/bx/help/2_Queries/scanv
-share/bx/help/2_Queries/scano
-share/bx/help/2_Queries/scann
-share/bx/help/2_Queries/scanf
-share/bx/help/2_Queries/scans
+share/bx/help/2_Queries/ww
+share/bx/help/3_Operators/3_Operators
 share/bx/help/3_Operators/connect
+share/bx/help/3_Operators/deoper
 share/bx/help/3_Operators/die
+share/bx/help/3_Operators/dline
 share/bx/help/3_Operators/hash
+share/bx/help/3_Operators/helpop
+share/bx/help/3_Operators/helpserv
 share/bx/help/3_Operators/kill
+share/bx/help/3_Operators/kline
+share/bx/help/3_Operators/locop
 share/bx/help/3_Operators/oper
 share/bx/help/3_Operators/rehash
 share/bx/help/3_Operators/restart
 share/bx/help/3_Operators/rping
-share/bx/help/3_Operators/squit
-share/bx/help/3_Operators/uping
-share/bx/help/3_Operators/3_Operators
-share/bx/help/3_Operators/wallops
 share/bx/help/3_Operators/sping
-share/bx/help/3_Operators/dline
+share/bx/help/3_Operators/squit
 share/bx/help/3_Operators/swallop
-share/bx/help/3_Operators/locop
-share/bx/help/3_Operators/deoper
 share/bx/help/3_Operators/tkline
 share/bx/help/3_Operators/unkline
-share/bx/help/3_Operators/kline
-share/bx/help/3_Operators/helpserv
-share/bx/help/3_Operators/helpop
+share/bx/help/3_Operators/uping
+share/bx/help/3_Operators/wallops
+share/bx/help/4_Misc/4_Misc
+share/bx/help/4_Misc/abort
+share/bx/help/4_Misc/beep
+share/bx/help/4_Misc/bind/backspace
 share/bx/help/4_Misc/bind/backward_character
 share/bx/help/4_Misc/bind/backward_history
 share/bx/help/4_Misc/bind/backward_word
@@ -205,8 +214,8 @@ share/bx/help/4_Misc/bind/enter_digraph
 share/bx/help/4_Misc/bind/enter_menu
 share/bx/help/4_Misc/bind/erase_line
 share/bx/help/4_Misc/bind/erase_to_beg_of_line
-share/bx/help/4_Misc/bind/forward_character
 share/bx/help/4_Misc/bind/erase_to_end_of_line
+share/bx/help/4_Misc/bind/forward_character
 share/bx/help/4_Misc/bind/forward_history
 share/bx/help/4_Misc/bind/forward_word
 share/bx/help/4_Misc/bind/highlight_off
@@ -230,7 +239,6 @@ share/bx/help/4_Misc/bind/self_insert
 share/bx/help/4_Misc/bind/send_line
 share/bx/help/4_Misc/bind/shove_to_history
 share/bx/help/4_Misc/bind/stop_irc
-share/bx/help/4_Misc/bind/type_text
 share/bx/help/4_Misc/bind/swap_last_window
 share/bx/help/4_Misc/bind/swap_next_window
 share/bx/help/4_Misc/bind/swap_previous_window
@@ -238,11 +246,25 @@ share/bx/help/4_Misc/bind/switch_channels
 share/bx/help/4_Misc/bind/toggle_insert_mode
 share/bx/help/4_Misc/bind/toggle_stop_screen
 share/bx/help/4_Misc/bind/transpose_characters
+share/bx/help/4_Misc/bind/type_text
 share/bx/help/4_Misc/bind/unclear_screen
 share/bx/help/4_Misc/bind/underline
 share/bx/help/4_Misc/bind/unstop_all_windows
-share/bx/help/4_Misc/bind/backspace
 share/bx/help/4_Misc/bind/yank_from_cutbuffer
+share/bx/help/4_Misc/cd
+share/bx/help/4_Misc/clear
+share/bx/help/4_Misc/digraph
+share/bx/help/4_Misc/encrypt
+share/bx/help/4_Misc/history
+share/bx/help/4_Misc/hostname
+share/bx/help/4_Misc/ircuser
+share/bx/help/4_Misc/mesg
+share/bx/help/4_Misc/mlist
+share/bx/help/4_Misc/mload
+share/bx/help/4_Misc/note
+share/bx/help/4_Misc/rbind
+share/bx/help/4_Misc/realname
+share/bx/help/4_Misc/set/always_split_biggest
 share/bx/help/4_Misc/set/auto_new_nick
 share/bx/help/4_Misc/set/auto_reconnect_delay
 share/bx/help/4_Misc/set/auto_rejoin
@@ -285,7 +307,6 @@ share/bx/help/4_Misc/set/eight_bit_characters
 share/bx/help/4_Misc/set/encrypt_program
 share/bx/help/4_Misc/set/floating_point_math
 share/bx/help/4_Misc/set/flood_after
-share/bx/help/4_Misc/set/history
 share/bx/help/4_Misc/set/flood_rate
 share/bx/help/4_Misc/set/flood_users
 share/bx/help/4_Misc/set/flood_warning
@@ -295,8 +316,9 @@ share/bx/help/4_Misc/set/help_path
 share/bx/help/4_Misc/set/help_prompt
 share/bx/help/4_Misc/set/help_window
 share/bx/help/4_Misc/set/hide_private_channels
-share/bx/help/4_Misc/set/highlight_char
 share/bx/help/4_Misc/set/high_bit_escape
+share/bx/help/4_Misc/set/highlight_char
+share/bx/help/4_Misc/set/history
 share/bx/help/4_Misc/set/history_file
 share/bx/help/4_Misc/set/hold_mode
 share/bx/help/4_Misc/set/indent
@@ -315,30 +337,29 @@ share/bx/help/4_Misc/set/menu
 share/bx/help/4_Misc/set/mirc_broken_dcc_resume
 share/bx/help/4_Misc/set/mode_stripper
 share/bx/help/4_Misc/set/nd_space_max
+share/bx/help/4_Misc/set/no_control_log
+share/bx/help/4_Misc/set/no_ctcp_flood
+share/bx/help/4_Misc/set/no_fail_disconnect
 share/bx/help/4_Misc/set/notify_handler
 share/bx/help/4_Misc/set/notify_interval
 share/bx/help/4_Misc/set/notify_level
 share/bx/help/4_Misc/set/notify_on_termination
 share/bx/help/4_Misc/set/notify_userhost_automatic
 share/bx/help/4_Misc/set/novice
-share/bx/help/4_Misc/set/no_control_log
-share/bx/help/4_Misc/set/no_ctcp_flood
-share/bx/help/4_Misc/set/no_fail_disconnect
 share/bx/help/4_Misc/set/num_of_whowas
 share/bx/help/4_Misc/set/pad_char
 share/bx/help/4_Misc/set/quit_message
 share/bx/help/4_Misc/set/realname
 share/bx/help/4_Misc/set/reverse_status_line
-share/bx/help/4_Misc/set/set
-share/bx/help/4_Misc/set/scroll
 share/bx/help/4_Misc/set/reverse_video
 share/bx/help/4_Misc/set/screen_options
+share/bx/help/4_Misc/set/scroll
+share/bx/help/4_Misc/set/scroll_lines
 share/bx/help/4_Misc/set/scrollback
-share/bx/help/4_Misc/set/tab
 share/bx/help/4_Misc/set/scrollback_ratio
-share/bx/help/4_Misc/set/scroll_lines
 share/bx/help/4_Misc/set/security
 share/bx/help/4_Misc/set/send_ignore_msg
+share/bx/help/4_Misc/set/set
 share/bx/help/4_Misc/set/shell
 share/bx/help/4_Misc/set/shell_flags
 share/bx/help/4_Misc/set/shell_limit
@@ -352,8 +373,6 @@ share/bx/help/4_Misc/set/status_away
 share/bx/help/4_Misc/set/status_channel
 share/bx/help/4_Misc/set/status_chanop
 share/bx/help/4_Misc/set/status_clock
-share/bx/help/4_Misc/set/tab_max
-share/bx/help/4_Misc/set/xterm
 share/bx/help/4_Misc/set/status_does_expandos
 share/bx/help/4_Misc/set/status_format
 share/bx/help/4_Misc/set/status_hold
@@ -362,8 +381,8 @@ share/bx/help/4_Misc/set/status_insert
 share/bx/help/4_Misc/set/status_mail
 share/bx/help/4_Misc/set/status_mode
 share/bx/help/4_Misc/set/status_nick
-share/bx/help/4_Misc/set/status_notify
 share/bx/help/4_Misc/set/status_no_repeat
+share/bx/help/4_Misc/set/status_notify
 share/bx/help/4_Misc/set/status_oper
 share/bx/help/4_Misc/set/status_overwrite
 share/bx/help/4_Misc/set/status_query
@@ -374,14 +393,20 @@ share/bx/help/4_Misc/set/status_umode
 share/bx/help/4_Misc/set/status_user
 share/bx/help/4_Misc/set/status_voice
 share/bx/help/4_Misc/set/status_window
-share/bx/help/4_Misc/set/underline_video
 share/bx/help/4_Misc/set/suppress_from_remote_server
 share/bx/help/4_Misc/set/suppress_server_motd
+share/bx/help/4_Misc/set/tab
+share/bx/help/4_Misc/set/tab_max
+share/bx/help/4_Misc/set/underline_video
 share/bx/help/4_Misc/set/user_information
 share/bx/help/4_Misc/set/verbose_ctcp
 share/bx/help/4_Misc/set/warn_of_ignores
-share/bx/help/4_Misc/set/always_split_biggest
+share/bx/help/4_Misc/set/xterm
 share/bx/help/4_Misc/set/xterm_options
+share/bx/help/4_Misc/summon
+share/bx/help/4_Misc/unclear
+share/bx/help/4_Misc/which
+share/bx/help/4_Misc/window/add
 share/bx/help/4_Misc/window/back
 share/bx/help/4_Misc/window/balance
 share/bx/help/4_Misc/window/beep_always
@@ -400,8 +425,8 @@ share/bx/help/4_Misc/window/hide
 share/bx/help/4_Misc/window/hide_others
 share/bx/help/4_Misc/window/hold_mode
 share/bx/help/4_Misc/window/kill
-share/bx/help/4_Misc/window/killswap
 share/bx/help/4_Misc/window/kill_others
+share/bx/help/4_Misc/window/killswap
 share/bx/help/4_Misc/window/last
 share/bx/help/4_Misc/window/lastlog
 share/bx/help/4_Misc/window/lastlog_level
@@ -437,27 +462,37 @@ share/bx/help/4_Misc/window/stack
 share/bx/help/4_Misc/window/status_special
 share/bx/help/4_Misc/window/swap
 share/bx/help/4_Misc/window/unbind
-share/bx/help/4_Misc/window/add
 share/bx/help/4_Misc/window/window
-share/bx/help/4_Misc/history
-share/bx/help/4_Misc/hostname
-share/bx/help/4_Misc/4_Misc
-share/bx/help/4_Misc/mesg
-share/bx/help/4_Misc/mlist
-share/bx/help/4_Misc/mload
-share/bx/help/4_Misc/note
-share/bx/help/4_Misc/rbind
-share/bx/help/4_Misc/realname
-share/bx/help/4_Misc/summon
-share/bx/help/4_Misc/unclear
-share/bx/help/4_Misc/which
-share/bx/help/4_Misc/ircuser
-share/bx/help/4_Misc/abort
-share/bx/help/4_Misc/beep
-share/bx/help/4_Misc/cd
-share/bx/help/4_Misc/clear
-share/bx/help/4_Misc/digraph
-share/bx/help/4_Misc/encrypt
+share/bx/help/5_Programming/5_Programming
+share/bx/help/5_Programming/alias
+share/bx/help/5_Programming/assign
+share/bx/help/5_Programming/blah
+share/bx/help/5_Programming/bless
+share/bx/help/5_Programming/break
+share/bx/help/5_Programming/call
+share/bx/help/5_Programming/comment
+share/bx/help/5_Programming/continue
+share/bx/help/5_Programming/do
+share/bx/help/5_Programming/dump
+share/bx/help/5_Programming/echo
+share/bx/help/5_Programming/eval
+share/bx/help/5_Programming/exec
+share/bx/help/5_Programming/fe
+share/bx/help/5_Programming/fec
+share/bx/help/5_Programming/filedialog
+share/bx/help/5_Programming/fontdialog
+share/bx/help/5_Programming/for
+share/bx/help/5_Programming/foreach
+share/bx/help/5_Programming/hook
+share/bx/help/5_Programming/if
+share/bx/help/5_Programming/input
+share/bx/help/5_Programming/load
+share/bx/help/5_Programming/loaddll
+share/bx/help/5_Programming/loadtcl
+share/bx/help/5_Programming/local
+share/bx/help/5_Programming/menu
+share/bx/help/5_Programming/menuitem
+share/bx/help/5_Programming/on/action
 share/bx/help/5_Programming/on/channel_nick
 share/bx/help/5_Programming/on/channel_signoff
 share/bx/help/5_Programming/on/connect
@@ -510,7 +545,6 @@ share/bx/help/5_Programming/on/public_notice
 share/bx/help/5_Programming/on/public_other
 share/bx/help/5_Programming/on/raw_irc
 share/bx/help/5_Programming/on/redirect
-share/bx/help/5_Programming/on/set
 share/bx/help/5_Programming/on/send_action
 share/bx/help/5_Programming/on/send_ctcp
 share/bx/help/5_Programming/on/send_dcc_chat
@@ -520,6 +554,7 @@ share/bx/help/5_Programming/on/send_public
 share/bx/help/5_Programming/on/send_to_server
 share/bx/help/5_Programming/on/server_lost
 share/bx/help/5_Programming/on/server_notice
+share/bx/help/5_Programming/on/set
 share/bx/help/5_Programming/on/signoff
 share/bx/help/5_Programming/on/silence
 share/bx/help/5_Programming/on/status_update
@@ -534,45 +569,22 @@ share/bx/help/5_Programming/on/window
 share/bx/help/5_Programming/on/window_create
 share/bx/help/5_Programming/on/window_kill
 share/bx/help/5_Programming/on/yell
-share/bx/help/5_Programming/on/action
-share/bx/help/5_Programming/blah
-share/bx/help/5_Programming/bless
-share/bx/help/5_Programming/break
-share/bx/help/5_Programming/call
-share/bx/help/5_Programming/comment
-share/bx/help/5_Programming/continue
-share/bx/help/5_Programming/do
-share/bx/help/5_Programming/dump
-share/bx/help/5_Programming/echo
-share/bx/help/5_Programming/eval
-share/bx/help/5_Programming/exec
-share/bx/help/5_Programming/fe
-share/bx/help/5_Programming/filedialog
-share/bx/help/5_Programming/fontdialog
-share/bx/help/5_Programming/for
-share/bx/help/5_Programming/foreach
-share/bx/help/5_Programming/hook
-share/bx/help/5_Programming/if
-share/bx/help/5_Programming/input
-share/bx/help/5_Programming/load
-share/bx/help/5_Programming/local
-share/bx/help/5_Programming/menu
-share/bx/help/5_Programming/menuitem
 share/bx/help/5_Programming/package
 share/bx/help/5_Programming/parsekey
 share/bx/help/5_Programming/pmpaste
 share/bx/help/5_Programming/pop
-share/bx/help/5_Programming/pretend
-share/bx/help/5_Programming/push
 share/bx/help/5_Programming/popupmenu
 share/bx/help/5_Programming/popupmsg
+share/bx/help/5_Programming/pretend
 share/bx/help/5_Programming/properties
+share/bx/help/5_Programming/push
 share/bx/help/5_Programming/queue
 share/bx/help/5_Programming/quote
 share/bx/help/5_Programming/redirect
 share/bx/help/5_Programming/repeat
 share/bx/help/5_Programming/return
 share/bx/help/5_Programming/save
+share/bx/help/5_Programming/saveirc
 share/bx/help/5_Programming/send
 share/bx/help/5_Programming/sendline
 share/bx/help/5_Programming/setenv
@@ -591,14 +603,8 @@ share/bx/help/5_Programming/wait
 share/bx/help/5_Programming/while
 share/bx/help/5_Programming/xecho
 share/bx/help/5_Programming/xeval
-share/bx/help/5_Programming/5_Programming
 share/bx/help/5_Programming/xtype
-share/bx/help/5_Programming/alias
-share/bx/help/5_Programming/assign
-share/bx/help/5_Programming/loadtcl
-share/bx/help/5_Programming/saveirc
-share/bx/help/5_Programming/loaddll
-share/bx/help/5_Programming/fec
+share/bx/help/6_Functions/6_Functions
 share/bx/help/6_Functions/absstrlen
 share/bx/help/6_Functions/addtabkey
 share/bx/help/6_Functions/after
@@ -607,6 +613,7 @@ share/bx/help/6_Functions/ajoinitem
 share/bx/help/6_Functions/aliasctl
 share/bx/help/6_Functions/annoy
 share/bx/help/6_Functions/ascii
+share/bx/help/6_Functions/before
 share/bx/help/6_Functions/bitchx
 share/bx/help/6_Functions/center
 share/bx/help/6_Functions/cexist
@@ -616,6 +623,7 @@ share/bx/help/6_Functions/chmod
 share/bx/help/6_Functions/chngw
 share/bx/help/6_Functions/chop
 share/bx/help/6_Functions/chops
+share/bx/help/6_Functions/chr
 share/bx/help/6_Functions/close
 share/bx/help/6_Functions/common
 share/bx/help/6_Functions/connect
@@ -627,11 +635,11 @@ share/bx/help/6_Functions/crypt
 share/bx/help/6_Functions/curpos
 share/bx/help/6_Functions/currchans
 share/bx/help/6_Functions/decode
-share/bx/help/6_Functions/eof
 share/bx/help/6_Functions/delarray
 share/bx/help/6_Functions/delitem
 share/bx/help/6_Functions/deuhc
 share/bx/help/6_Functions/encode
+share/bx/help/6_Functions/eof
 share/bx/help/6_Functions/epic
 share/bx/help/6_Functions/fexist
 share/bx/help/6_Functions/filter
@@ -648,6 +656,7 @@ share/bx/help/6_Functions/getgid
 share/bx/help/6_Functions/getitem
 share/bx/help/6_Functions/getlogin
 share/bx/help/6_Functions/getmatches
+share/bx/help/6_Functions/getopt
 share/bx/help/6_Functions/getpgrp
 share/bx/help/6_Functions/getsets
 share/bx/help/6_Functions/gettmatch
@@ -655,13 +664,14 @@ share/bx/help/6_Functions/getuid
 share/bx/help/6_Functions/glob
 share/bx/help/6_Functions/gui
 share/bx/help/6_Functions/idle
+share/bx/help/6_Functions/ifindfirst
 share/bx/help/6_Functions/ifinditem
 share/bx/help/6_Functions/igetmatches
 share/bx/help/6_Functions/igmask
-share/bx/help/6_Functions/info
 share/bx/help/6_Functions/igtype
 share/bx/help/6_Functions/index
 share/bx/help/6_Functions/indextoitem
+share/bx/help/6_Functions/info
 share/bx/help/6_Functions/insertw
 share/bx/help/6_Functions/iptoname
 share/bx/help/6_Functions/irclib
@@ -683,11 +693,13 @@ share/bx/help/6_Functions/lastserver
 share/bx/help/6_Functions/left
 share/bx/help/6_Functions/leftpc
 share/bx/help/6_Functions/leftw
+share/bx/help/6_Functions/listarray
 share/bx/help/6_Functions/listen
-share/bx/help/6_Functions/mid
 share/bx/help/6_Functions/mask
 share/bx/help/6_Functions/match
 share/bx/help/6_Functions/matchitem
+share/bx/help/6_Functions/menucontrol
+share/bx/help/6_Functions/mid
 share/bx/help/6_Functions/midw
 share/bx/help/6_Functions/mkdir
 share/bx/help/6_Functions/msar
@@ -740,12 +752,14 @@ share/bx/help/6_Functions/split
 share/bx/help/6_Functions/srand
 share/bx/help/6_Functions/status
 share/bx/help/6_Functions/stime
+share/bx/help/6_Functions/strchr
 share/bx/help/6_Functions/strftime
 share/bx/help/6_Functions/strip
 share/bx/help/6_Functions/stripansi
 share/bx/help/6_Functions/stripansicodes
 share/bx/help/6_Functions/stripc
 share/bx/help/6_Functions/strlen
+share/bx/help/6_Functions/strrchr
 share/bx/help/6_Functions/substr
 share/bx/help/6_Functions/tdiff
 share/bx/help/6_Functions/time
@@ -780,16 +794,8 @@ share/bx/help/6_Functions/winsize
 share/bx/help/6_Functions/winvisible
 share/bx/help/6_Functions/word
 share/bx/help/6_Functions/write
-share/bx/help/6_Functions/6_Functions
 share/bx/help/6_Functions/writeb
-share/bx/help/6_Functions/menucontrol
-share/bx/help/6_Functions/before
-share/bx/help/6_Functions/chr
-share/bx/help/6_Functions/getopt
-share/bx/help/6_Functions/ifindfirst
-share/bx/help/6_Functions/listarray
-share/bx/help/6_Functions/strchr
-share/bx/help/6_Functions/strrchr
+share/bx/help/7_Docs/7_Docs
 share/bx/help/7_Docs/About_BitchX
 share/bx/help/7_Docs/Arrays
 share/bx/help/7_Docs/Command_Line
@@ -811,8 +817,8 @@ share/bx/help/7_Docs/Signals
 share/bx/help/7_Docs/Special_Vars
 share/bx/help/7_Docs/Status_Line
 share/bx/help/7_Docs/Text_Highlight
-share/bx/help/7_Docs/7_Docs
 share/bx/help/7_Docs/Updates
+share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/8_Scripts
 share/bx/help/8_Scripts/action
 share/bx/help/8_Scripts/alias
@@ -839,7 +845,6 @@ share/bx/help/8_Scripts/events
 share/bx/help/8_Scripts/events.hop
 share/bx/help/8_Scripts/fake-dcc
 share/bx/help/8_Scripts/fe
-share/bx/help/8_Scripts/guh
 share/bx/help/8_Scripts/files
 share/bx/help/8_Scripts/finger
 share/bx/help/8_Scripts/fnet
@@ -848,6 +853,7 @@ share/bx/help/8_Scripts/functions
 share/bx/help/8_Scripts/funnyban
 share/bx/help/8_Scripts/genalias
 share/bx/help/8_Scripts/global
+share/bx/help/8_Scripts/guh
 share/bx/help/8_Scripts/history
 share/bx/help/8_Scripts/history-match
 share/bx/help/8_Scripts/imap
@@ -874,13 +880,13 @@ share/bx/help/8_Scripts/mudlike
 share/bx/help/8_Scripts/multi
 share/bx/help/8_Scripts/nemesis
 share/bx/help/8_Scripts/netsplit
-share/bx/help/8_Scripts/ping
 share/bx/help/8_Scripts/netsplit.env
 share/bx/help/8_Scripts/newaway
 share/bx/help/8_Scripts/newformat
 share/bx/help/8_Scripts/nicks
 share/bx/help/8_Scripts/old-dcc
 share/bx/help/8_Scripts/oldping
+share/bx/help/8_Scripts/ping
 share/bx/help/8_Scripts/pipe
 share/bx/help/8_Scripts/prefix
 share/bx/help/8_Scripts/recursion
@@ -903,20 +909,34 @@ share/bx/help/8_Scripts/uhnotify
 share/bx/help/8_Scripts/uping
 share/bx/help/8_Scripts/wallopstat
 share/bx/help/8_Scripts/webster
-share/bx/help/8_Scripts/2.8script
 share/bx/help/8_Scripts/window
 share/bx/help/README_FIRST
 share/bx/help/commands
 share/bx/help/findcomm
 share/bx/help/functions
 share/bx/help/out
+%%PLUGINS:%%share/bx/plugins/BitchX.hints
+%%PLUGINS:%%share/bx/plugins/acro.so 
+%%PLUGINS:%%share/bx/plugins/amp.so 
+%%PLUGINS:%%share/bx/plugins/autobot.so 
+%%PLUGINS:%%share/bx/plugins/blowfish.so 
+%%PLUGINS:%%share/bx/plugins/encrypt.so 
+%%PLUGINS:%%share/bx/plugins/fserv.so 
+%%PLUGINS:%%share/bx/plugins/hint.so 
+%%PLUGINS:%%share/bx/plugins/nap.so 
+%%PLUGINS:%%share/bx/plugins/pkga.so 
+%%PLUGINS:%%share/bx/plugins/possum.so 
+%%PLUGINS:%%share/bx/plugins/qmail.so 
+%%PLUGINS:%%share/bx/plugins/scan.so 
+%%PLUGINS:%%share/bx/plugins/wavplay.so 
+%%PLUGINS:%%share/bx/plugins/qbx.so 
 share/bx/script/actplug.gmz
 share/bx/script/bxglobal
 share/bx/script/bxtcl.tcl
+share/bx/script/example-.bitchxrc
 share/bx/script/file.tcl
 share/bx/script/fserve+vfs.tar.gz
 share/bx/script/menu.bx
-share/bx/script/example-.bitchxrc
 share/bx/script/query.bx
 share/bx/translation/ASCII
 share/bx/translation/CP437
@@ -951,21 +971,27 @@ share/bx/translation/SWEDISH_NAMES_COM
 share/bx/translation/SWISS
 share/bx/translation/UNITED_KINGDOM
 share/bx/translation/UNITED_KINGDOM_COM
+%%NOGNOME:%%share/bx/wserv
 share/doc/bitchx/bxfaq.html
-@dirrm share/bx/help/1_General/dcc
-@dirrm share/bx/help/1_General/ctcp
-@dirrm share/bx/help/1_General
-@dirrm share/bx/help/2_Queries
-@dirrm share/bx/help/3_Operators
-@dirrm share/bx/help/4_Misc/bind
-@dirrm share/bx/help/4_Misc/set
+@dirrm share/doc/bitchx
+@dirrm share/bx/translation
+@dirrm share/bx/script
+%%PLUGINS:%%@dirrm share/bx/plugins 
+@dirrm share/bx/help/8_Scripts
+@dirrm share/bx/help/7_Docs
+@dirrm share/bx/help/6_Functions
+@dirrm share/bx/help/5_Programming/on
+@dirrm share/bx/help/5_Programming
+@dirrm share/bx/help/4_Misc/wset
 @dirrm share/bx/help/4_Misc/window
+@dirrm share/bx/help/4_Misc/set
 @dirrm share/bx/help/4_Misc/fset
-@dirrm share/bx/help/4_Misc/wset
+@dirrm share/bx/help/4_Misc/bind
 @dirrm share/bx/help/4_Misc
-@dirrm share/bx/help/5_Programming/on
-@dirrm share/bx/help/5_Programming
-@dirrm share/bx/help/6_Functions
-@dirrm share/bx/help/7_Docs
-@dirrm share/bx/help/8_Scripts
-@dirrm share/doc/bitchx
+@dirrm share/bx/help/3_Operators
+@dirrm share/bx/help/2_Queries
+@dirrm share/bx/help/1_General/dcc
+@dirrm share/bx/help/1_General/ctcp
+@dirrm share/bx/help/1_General
+@dirrm share/bx/help
+@dirrm share/bx
diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile
index fcafc3e0be6c..a15774070c9a 100644
--- a/irc/xchat-devel/Makefile
+++ b/irc/xchat-devel/Makefile
@@ -14,78 +14,50 @@ MASTER_SITES=	http://xchat.org/files/source/1.5/ \
 
 MAINTAINER=	jim@FreeBSD.org
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-.endif
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME)
-WITH_GDK_PIXBUF=yes
-WITH_PANEL=	yes
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-.endif
-
-.if defined(WITH_GDK_PIXBUF)
-LIB_DEPENDS+=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
-.endif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GDK_PIXBUF_CONFIG?=	${X11BASE}/bin/gdk-pixbuf-config
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-python
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--enable-gnome
-PLIST_SUB+=	GNOME:=""
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+=--enable-panel
-.else
-CONFIGURE_ARGS+=--disable-panel
-.endif
-.else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
-.if defined(WITH_GDK_PIXBUF)
-CONFIGURE_ARGS+=--enable-gdk-pixbuf
-.else
-CONFIGURE_ARGS+=--disable-gdk-pixbuf
-.endif
-
 .if defined(WITH_SSL)
 USE_OPENSSL=	YES
 CONFIGURE_ARGS+=--enable-openssl
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
+.else
+CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
+.endif
+
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
-	@strip ${PREFIX}/bin/xchat
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
+	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
 	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index 4c0318ade4a9..9bc401a1ed4d 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -13,61 +13,45 @@ MASTER_SITES=	http://xchat.org/files/source/1.4/ \
 
 MAINTAINER=	jim@FreeBSD.org
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-.endif
-LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME)
-WITH_GDK_PIXBUF=yes
-WITH_PANEL=	yes
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-.endif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-python
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--enable-gnome
-PLIST_SUB+=	GNOME:=""
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+=--enable-panel
-.else
-CONFIGURE_ARGS+=--disable-panel
-.endif
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
 .else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
+CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
-	@strip ${PREFIX}/bin/xchat
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
+	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
 	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 4c0318ade4a9..9bc401a1ed4d 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -13,61 +13,45 @@ MASTER_SITES=	http://xchat.org/files/source/1.4/ \
 
 MAINTAINER=	jim@FreeBSD.org
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-.endif
-LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME)
-WITH_GDK_PIXBUF=yes
-WITH_PANEL=	yes
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-.endif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-python
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--enable-gnome
-PLIST_SUB+=	GNOME:=""
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+=--enable-panel
-.else
-CONFIGURE_ARGS+=--disable-panel
-.endif
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
 .else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
+CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
-	@strip ${PREFIX}/bin/xchat
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
+	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
 	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 4c0318ade4a9..9bc401a1ed4d 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -13,61 +13,45 @@ MASTER_SITES=	http://xchat.org/files/source/1.4/ \
 
 MAINTAINER=	jim@FreeBSD.org
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-.endif
-LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME)
-WITH_GDK_PIXBUF=yes
-WITH_PANEL=	yes
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-.endif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-python
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--enable-gnome
-PLIST_SUB+=	GNOME:=""
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+=--enable-panel
-.else
-CONFIGURE_ARGS+=--disable-panel
-.endif
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
 .else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
+CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
-	@strip ${PREFIX}/bin/xchat
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
+	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
 	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index 4c0318ade4a9..9bc401a1ed4d 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -13,61 +13,45 @@ MASTER_SITES=	http://xchat.org/files/source/1.4/ \
 
 MAINTAINER=	jim@FreeBSD.org
 
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-.endif
-LIB_DEPENDS+=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		Imlib.5:${PORTSDIR}/graphics/imlib
-.if defined(WITH_GNOME)
-LIB_DEPENDS+=	gnome.4:${PORTSDIR}/x11/gnomelibs
-.endif
-
-.if exists(${X11BASE}/bin/panel) && defined(WITH_GNOME)
-WITH_GDK_PIXBUF=yes
-WITH_PANEL=	yes
-LIB_DEPENDS+=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-.endif
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
+USE_IMLIB=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-python
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=--enable-socks
 .endif
 
-.if defined(WITH_GNOME)
-CONFIGURE_ARGS+=--enable-gnome
-PLIST_SUB+=	GNOME:=""
-.if defined(WITH_PANEL)
-CONFIGURE_ARGS+=--enable-panel
-.else
-CONFIGURE_ARGS+=--disable-panel
-.endif
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome --enable-panel --enable-gdk-pixbuf
 .else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
+CONFIGURE_ARGS+=--disable-gnome --disable-gdk-pixbuf
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 post-install:
-	@strip ${PREFIX}/bin/xchat
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
+	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
 	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>