Attachment #168331 for bug #207674




# Created by: Will Andrews <andrews@technologist.com>
# $FreeBSD$

PORTNAME=	ScrollZ
PORTVERSION=	2.3
DISTVERSIONPREFIX=	${PORTNAME}-
CATEGORIES=	irc ipv6
MASTER_SITES=	http://www.netraam.net/scrollz/download/ \
		http://BSDforge.com/projects/source/irc/scrollz/
DISTNAME=	ScrollZ-${PORTVERSION}

MAINTAINER=	freebsd@bitchx.org
COMMENT=	Enhanced ircII client that supports scripts, colors, and more

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

USES=		gmake iconv ncurses
USE_GITHUB=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--enable-ipv6 --enable-regexp --enable-utf8

DATADIR=	${PREFIX}/share/${PORTNAME:tl}
PLIST_SUB=	SCROLLZ_VER="${PORTVERSION}"

OPTIONS_DEFINE=		IPV6 REGEX UTF8
OPTIONS_RADIO=		SSL
OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	OPENSSL REGEX UTF8

IPV_CONFIGURE_ENABLE=	ipv6
GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_USES=		pkgconfig
GNUTLS_CONFIGURE_ON=	--with-ssl
REGEX_CONFIGURE_ENABLE=	regexp
OPENSSL_USE=		OPENSSL=yes
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
UTF8_CONFIGURE_ENABLE=	utf8

.include <bsd.port.pre.mk>

.if !empty(ICONV_LIB)
CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
.endif

post-patch:
	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure

pre-build:
.if !defined(BATCH)
	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \
		SZdist.c)
	@(cd ${WRKSRC} && ./SZdist)
.endif

post-install:
.for i in scrollz-${PORTVERSION} wservz
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
.endfor

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)irc/scrollz/distinfo (-2 / +2 lines)
1	SHA256 (ScrollZ-2.2.3.tar.gz) = 7d95d323168d117b6cb6e73fe1de85b863de7c681b5004545b6eceb76c208d03	1	SHA256 (ScrollZ-ScrollZ-ScrollZ-2.3_GH0.tar.gz) = 22535bcc54ad752107ab181775d90d9cf1b37648f500d627f428388a9d3710e6
2	SIZE (ScrollZ-2.2.3.tar.gz) = 948958	2	SIZE (ScrollZ-ScrollZ-ScrollZ-2.3_GH0.tar.gz) = 981707




--- Makefile.in.orig	2011-04-29 17:21:18.000000000 +0900
+++ Makefile.in	2013-03-09 19:35:03.628110600 +0900
@@ -31,14 +31,14 @@
 # @(#)$Id: Makefile.in,v 1.23 2006-10-31 12:31:27 f Exp $
 
 # targets recognised by this makefile:
-#   all, everything	- compiles ircii, ircio, ircflush and wserv
+#   all, everything	- compiles ircii, ircio, ircflush and wservz
 #   ircio		- compiles ircio
 #   ircflush		- compiles ircflush
-#   wserv		- compiles wserv
-#   install		- installs ircii, ircio, ircflush and wserv
+#   wservz		- compiles wservz
+#   install		- installs ircii, ircio, ircflush and wservz
 #   installirc		- installs ircii
 #   installio		- installs ircio
-#   installwserv	- installs wserv
+#   installwservz	- installs wservz
 #   installflush	- installs ircflush
 #   installscript 	- installs the scripts
 #   installhelp		- installs the help files
@@ -50,9 +50,9 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
-sharedir = @prefix@/share
-mandir = @prefix@/share/man/man1
+sharedir = @datadir@
 datarootdir = @datarootdir@
-mandir = @mandir@
+mandir = @mandir@/man1

 DESTDIR =
 
@@ -105,7 +105,7 @@
 
 # This program allows you to use screen/xterm's to put new irc windows
 # on new screen/xterm windows.
-INSTALL_WSERV = $(bindir)/wserv
+INSTALL_WSERVZ = $(bindir)/wservz
 
 # This command will be used to install the irc help files.  If you don't
 # want to install them, replace with the following:
@@ -126,14 +126,13 @@
 VERSION = @VERSION@
 
 SHELL = /bin/sh
-MAKE = make $(MFLAGS)
 MFLAGS ='CC=$(CC)'					\
 	'CFLAGS=$(CFLAGS)'				\
 	'DEFS=$(DEFS)'					\
 	'HELP_DIR=$(HELP_DIR)'				\
 	'INSTALL_IRC=$(INSTALL_IRC)'			\
 	'INSTALL_IRCIO=$(INSTALL_IRCIO)'		\
-	'INSTALL_WSERV=$(INSTALL_WSERV)'		\
+	'INSTALL_WSERVZ=$(INSTALL_WSERVZ)'		\
 	'IRCSHARE=$(IRCSHARE)'				\
 	'IRCPATH=$(IRC_PATH)'				\
 	'LDFLAGS=$(LDFLAGS)'				\
@@ -143,32 +142,23 @@
 	'LN=$(LN)'					\
 	'RM=$(RM)'
 
-all: scrollz scrollz.1
+all: scrollz scrollz.1 wservz
 
-install: all installbin installdirs installman installhelp
+install: all installbin installwservz installdirs installman installhelp
 
-scrollz: source/Makefile Makefile
-	@cd source; $(MAKE) all
+scrollz ircio ircflush wservz: source/Makefile Makefile
+	$(MAKE) -C source $(MFLAGS) $@
 
 scrollz.1: scrollz.1.in
 	sed -e "s,SHAREDIR,$(IRCSHARE)," < scrollz.1.in > scrollz.1
 
 installeverything:  install installman installflush installio \
-		    installwserv installhelp
+		    installwservz installhelp
 
-everything: all ircflush ircio wserv
+everything: all ircflush ircio wservz
 
 ircserv: ircio
 
-ircio: source/Makefile
-	@cd source; $(MAKE) ircio
-
-ircflush: source/ircflush.c source/Makefile
-	@cd source; $(MAKE) ircflush
-
-wserv: source/wserv.c source/term.c source/Makefile
-	@cd source; $(MAKE) wserv
-
 installbin: installirc
 
 installirc: scrollz installdirs
@@ -189,8 +179,8 @@
 installflush: ircflush installdirs
 	$(INSTALL) source/ircflush $(DESTDIR)/$(INSTALL_IRCFLUSH)
 
-installwserv: wserv installdirs
-	$(INSTALL) source/wserv $(DESTDIR)/$(INSTALL_WSERV)
+installwservz: wservz installdirs
+	$(INSTALL) source/wservz $(DESTDIR)/$(INSTALL_WSERVZ)
 
 installdirs:
 	umask 022; ./mkinstalldirs $(DESTDIR)/$(IRCSHARE) $(DESTDIR)/$(bindir) \

Lines 1-9 Link Here

(-)irc/scrollz/pkg-descr (+2 lines)
1	ScrollZ is an IRC client based on ircII with many enhancements (colors,	1	ScrollZ is an IRC client based on ircII with many enhancements (colors,
2	userlists, enhanced scripting, and more). The main difference from	2	userlists, enhanced scripting, and more). The main difference from
3	other clients is that it implements many useful features that you would	3	other clients is that it implements many useful features that you would
4	normally find in a script, thus making it faster than such scripts	4	normally find in a script, thus making it faster than such scripts
5	paired up with ircII.	5	paired up with ircII.
6		6
7	It also has many unique features, such as three-line status bars, CDCC	7	It also has many unique features, such as three-line status bars, CDCC
8	(which has reget/resend ability), and its environment is highly	8	(which has reget/resend ability), and its environment is highly
9	customizable.	9	customizable.
		10
		11	WWW: http://www.scrollz.info/




bin/scrollz
bin/scrollz-%%SCROLLZ_VER%%
bin/wservz
man/man1/scrollz.1.gz
%%DATADIR%%/doc/ScrollZ.doc
%%DATADIR%%/help/!
%%DATADIR%%/help/:
%%DATADIR%%/help/abort
%%DATADIR%%/help/about
%%DATADIR%%/help/addbk
%%DATADIR%%/help/addchan
%%DATADIR%%/help/addf
%%DATADIR%%/help/addfchan
%%DATADIR%%/help/addfflag
%%DATADIR%%/help/addmon
%%DATADIR%%/help/addn
%%DATADIR%%/help/adds
%%DATADIR%%/help/addw
%%DATADIR%%/help/admin
%%DATADIR%%/help/ajoin
%%DATADIR%%/help/alias/alias
%%DATADIR%%/help/alias/functions
%%DATADIR%%/help/alias/quote
%%DATADIR%%/help/alias/special
%%DATADIR%%/help/alias/szvar
%%DATADIR%%/help/alias/width
%%DATADIR%%/help/arejoin
%%DATADIR%%/help/arinwin
%%DATADIR%%/help/assign
%%DATADIR%%/help/autocompl
%%DATADIR%%/help/autoinv
%%DATADIR%%/help/autoopdelay
%%DATADIR%%/help/away
%%DATADIR%%/help/awayencr
%%DATADIR%%/help/awaysave
%%DATADIR%%/help/awayt
%%DATADIR%%/help/ban
%%DATADIR%%/help/bantime
%%DATADIR%%/help/bantype
%%DATADIR%%/help/basics
%%DATADIR%%/help/beep
%%DATADIR%%/help/bind/accept_last_chat
%%DATADIR%%/help/bind/backspace
%%DATADIR%%/help/bind/backward_character
%%DATADIR%%/help/bind/backward_history
%%DATADIR%%/help/bind/backward_word
%%DATADIR%%/help/bind/beginning_of_line
%%DATADIR%%/help/bind/bind
%%DATADIR%%/help/bind/clear_screen
%%DATADIR%%/help/bind/command_completion
%%DATADIR%%/help/bind/delete_character
%%DATADIR%%/help/bind/delete_next_word
%%DATADIR%%/help/bind/delete_previous_word
%%DATADIR%%/help/bind/end_of_line
%%DATADIR%%/help/bind/enter_digraph
%%DATADIR%%/help/bind/enter_menu
%%DATADIR%%/help/bind/erase_line
%%DATADIR%%/help/bind/erase_to_beg_of_line
%%DATADIR%%/help/bind/erase_to_end_of_line
%%DATADIR%%/help/bind/examples
%%DATADIR%%/help/bind/forward_character
%%DATADIR%%/help/bind/forward_history
%%DATADIR%%/help/bind/forward_word
%%DATADIR%%/help/bind/help_character
%%DATADIR%%/help/bind/insert_autoreply
%%DATADIR%%/help/bind/insert_tabkey_next
%%DATADIR%%/help/bind/insert_tabkey_prev
%%DATADIR%%/help/bind/keys
%%DATADIR%%/help/bind/lastjoiner_kick
%%DATADIR%%/help/bind/meta1_character
%%DATADIR%%/help/bind/meta2_character
%%DATADIR%%/help/bind/meta3_character
%%DATADIR%%/help/bind/meta4_character
%%DATADIR%%/help/bind/meta5_character
%%DATADIR%%/help/bind/meta6_character
%%DATADIR%%/help/bind/meta7_character
%%DATADIR%%/help/bind/meta8_character
%%DATADIR%%/help/bind/next_window
%%DATADIR%%/help/bind/nothing
%%DATADIR%%/help/bind/parse_command
%%DATADIR%%/help/bind/previous_window
%%DATADIR%%/help/bind/push_empty_stack
%%DATADIR%%/help/bind/push_line
%%DATADIR%%/help/bind/quit_irc
%%DATADIR%%/help/bind/quote_character
%%DATADIR%%/help/bind/refresh_inputline
%%DATADIR%%/help/bind/refresh_screen
%%DATADIR%%/help/bind/scroll_backward
%%DATADIR%%/help/bind/scroll_end
%%DATADIR%%/help/bind/scroll_forward
%%DATADIR%%/help/bind/scroll_start
%%DATADIR%%/help/bind/self_insert
%%DATADIR%%/help/bind/send_line
%%DATADIR%%/help/bind/stop_irc
%%DATADIR%%/help/bind/switch_channels
%%DATADIR%%/help/bind/toggle_insert_mode
%%DATADIR%%/help/bind/toggle_stop_screen
%%DATADIR%%/help/bind/transpose_characters
%%DATADIR%%/help/bind/type_text
%%DATADIR%%/help/bind/unstop_all_windows
%%DATADIR%%/help/bind/yank_from_cutbuffer
%%DATADIR%%/help/bitch
%%DATADIR%%/help/bk
%%DATADIR%%/help/bki
%%DATADIR%%/help/bklist
%%DATADIR%%/help/bkt
%%DATADIR%%/help/bye
%%DATADIR%%/help/c
%%DATADIR%%/help/cat
%%DATADIR%%/help/cd
%%DATADIR%%/help/cdban
%%DATADIR%%/help/cdcc/autoget
%%DATADIR%%/help/cdcc/chan
%%DATADIR%%/help/cdcc/close
%%DATADIR%%/help/cdcc/dldir
%%DATADIR%%/help/cdcc/doffer
%%DATADIR%%/help/cdcc/fsend
%%DATADIR%%/help/cdcc/get
%%DATADIR%%/help/cdcc/idle
%%DATADIR%%/help/cdcc/limit
%%DATADIR%%/help/cdcc/list
%%DATADIR%%/help/cdcc/load
%%DATADIR%%/help/cdcc/longst
%%DATADIR%%/help/cdcc/notice
%%DATADIR%%/help/cdcc/ntime
%%DATADIR%%/help/cdcc/offer
%%DATADIR%%/help/cdcc/overwr
%%DATADIR%%/help/cdcc/plist
%%DATADIR%%/help/cdcc/psend
%%DATADIR%%/help/cdcc/ptime
%%DATADIR%%/help/cdcc/queue
%%DATADIR%%/help/cdcc/renpack
%%DATADIR%%/help/cdcc/request
%%DATADIR%%/help/cdcc/resend
%%DATADIR%%/help/cdcc/save
%%DATADIR%%/help/cdcc/secure
%%DATADIR%%/help/cdcc/send
%%DATADIR%%/help/cdcc/stats
%%DATADIR%%/help/cdcc/status
%%DATADIR%%/help/cdcc/uldir
%%DATADIR%%/help/cdcc/verbose
%%DATADIR%%/help/cdcc/warning
%%DATADIR%%/help/chanlog
%%DATADIR%%/help/chanlogdir
%%DATADIR%%/help/chanlogpost
%%DATADIR%%/help/chanlogprefix
%%DATADIR%%/help/channel
%%DATADIR%%/help/chanst
%%DATADIR%%/help/chat
%%DATADIR%%/help/chpass
%%DATADIR%%/help/chsignoff
%%DATADIR%%/help/cjoin
%%DATADIR%%/help/clear
%%DATADIR%%/help/clearmon
%%DATADIR%%/help/cleartab
%%DATADIR%%/help/color
%%DATADIR%%/help/commands
%%DATADIR%%/help/comment
%%DATADIR%%/help/compress
%%DATADIR%%/help/connect
%%DATADIR%%/help/cscan
%%DATADIR%%/help/ctcp/action
%%DATADIR%%/help/ctcp/clientinfo
%%DATADIR%%/help/ctcp/ctcp
%%DATADIR%%/help/ctcp/echo
%%DATADIR%%/help/ctcp/finger
%%DATADIR%%/help/ctcp/ping
%%DATADIR%%/help/ctcp/time
%%DATADIR%%/help/ctcp/userinfo
%%DATADIR%%/help/ctcp/utc
%%DATADIR%%/help/ctcp/version
%%DATADIR%%/help/ctcpcloak
%%DATADIR%%/help/cycle
%%DATADIR%%/help/date
%%DATADIR%%/help/dcc/chat
%%DATADIR%%/help/dcc/close
%%DATADIR%%/help/dcc/dcc
%%DATADIR%%/help/dcc/get
%%DATADIR%%/help/dcc/list
%%DATADIR%%/help/dcc/raw
%%DATADIR%%/help/dcc/rename
%%DATADIR%%/help/dcc/send
%%DATADIR%%/help/deop
%%DATADIR%%/help/deops
%%DATADIR%%/help/deopt
%%DATADIR%%/help/describe
%%DATADIR%%/help/dhop
%%DATADIR%%/help/die
%%DATADIR%%/help/digraph
%%DATADIR%%/help/dirlm
%%DATADIR%%/help/dirlmk
%%DATADIR%%/help/dirln
%%DATADIR%%/help/dirlnk
%%DATADIR%%/help/dirlsm
%%DATADIR%%/help/dirlsn
%%DATADIR%%/help/disconnect
%%DATADIR%%/help/dobans
%%DATADIR%%/help/dop
%%DATADIR%%/help/dprot
%%DATADIR%%/help/dump
%%DATADIR%%/help/dvoice
%%DATADIR%%/help/echo
%%DATADIR%%/help/ego
%%DATADIR%%/help/encrmsg
%%DATADIR%%/help/encrypt
%%DATADIR%%/help/etdelim
%%DATADIR%%/help/etiquette
%%DATADIR%%/help/etopic
%%DATADIR%%/help/eval
%%DATADIR%%/help/exec
%%DATADIR%%/help/exit
%%DATADIR%%/help/expressions
%%DATADIR%%/help/extmes
%%DATADIR%%/help/extpub
%%DATADIR%%/help/fake
%%DATADIR%%/help/fbk
%%DATADIR%%/help/fcline
%%DATADIR%%/help/fdline
%%DATADIR%%/help/fec
%%DATADIR%%/help/filine
%%DATADIR%%/help/finger
%%DATADIR%%/help/fk
%%DATADIR%%/help/fkline
%%DATADIR%%/help/flline
%%DATADIR%%/help/floodp
%%DATADIR%%/help/flush
%%DATADIR%%/help/foreach
%%DATADIR%%/help/frlist
%%DATADIR%%/help/ftrace
%%DATADIR%%/help/help
%%DATADIR%%/help/history
%%DATADIR%%/help/hook
%%DATADIR%%/help/hop
%%DATADIR%%/help/idlekick
%%DATADIR%%/help/idletime
%%DATADIR%%/help/if
%%DATADIR%%/help/ig
%%DATADIR%%/help/ignore
%%DATADIR%%/help/igtime
%%DATADIR%%/help/info
%%DATADIR%%/help/input
%%DATADIR%%/help/intro
%%DATADIR%%/help/inv
%%DATADIR%%/help/invite
%%DATADIR%%/help/ison
%%DATADIR%%/help/j
%%DATADIR%%/help/join
%%DATADIR%%/help/k
%%DATADIR%%/help/keys
%%DATADIR%%/help/keyx
%%DATADIR%%/help/kick
%%DATADIR%%/help/kickonban
%%DATADIR%%/help/kickonflood
%%DATADIR%%/help/kickops
%%DATADIR%%/help/kicks
%%DATADIR%%/help/kickt
%%DATADIR%%/help/kill
%%DATADIR%%/help/knock
%%DATADIR%%/help/kprot
%%DATADIR%%/help/l
%%DATADIR%%/help/lastlog
%%DATADIR%%/help/leave
%%DATADIR%%/help/levels
%%DATADIR%%/help/links
%%DATADIR%%/help/list
%%DATADIR%%/help/listbk
%%DATADIR%%/help/listf
%%DATADIR%%/help/listmon
%%DATADIR%%/help/listn
%%DATADIR%%/help/lists
%%DATADIR%%/help/listw
%%DATADIR%%/help/lk
%%DATADIR%%/help/llook
%%DATADIR%%/help/llookup
%%DATADIR%%/help/load
%%DATADIR%%/help/logon
%%DATADIR%%/help/ls
%%DATADIR%%/help/lusers
%%DATADIR%%/help/m
%%DATADIR%%/help/map
%%DATADIR%%/help/massdv
%%DATADIR%%/help/massv
%%DATADIR%%/help/mc
%%DATADIR%%/help/mdhop
%%DATADIR%%/help/mdop
%%DATADIR%%/help/me
%%DATADIR%%/help/menus
%%DATADIR%%/help/mhop
%%DATADIR%%/help/mirc
%%DATADIR%%/help/mk
%%DATADIR%%/help/mkill
%%DATADIR%%/help/mload
%%DATADIR%%/help/mode
%%DATADIR%%/help/modelock
%%DATADIR%%/help/modeunlock
%%DATADIR%%/help/monitor
%%DATADIR%%/help/mop
%%DATADIR%%/help/motd
%%DATADIR%%/help/mreop
%%DATADIR%%/help/msay
%%DATADIR%%/help/msg
%%DATADIR%%/help/multk
%%DATADIR%%/help/n
%%DATADIR%%/help/names
%%DATADIR%%/help/net
%%DATADIR%%/help/newhost
%%DATADIR%%/help/news
%%DATADIR%%/help/newuser
%%DATADIR%%/help/newusers
%%DATADIR%%/help/nhprot
%%DATADIR%%/help/nick
%%DATADIR%%/help/nickchan
%%DATADIR%%/help/nicks
%%DATADIR%%/help/nickt
%%DATADIR%%/help/nochat
%%DATADIR%%/help/noig
%%DATADIR%%/help/nokey
%%DATADIR%%/help/note/antiwall
%%DATADIR%%/help/note/count
%%DATADIR%%/help/note/deny
%%DATADIR%%/help/note/find
%%DATADIR%%/help/note/flag
%%DATADIR%%/help/note/key
%%DATADIR%%/help/note/log
%%DATADIR%%/help/note/ls
%%DATADIR%%/help/note/news
%%DATADIR%%/help/note/note
%%DATADIR%%/help/note/rm
%%DATADIR%%/help/note/save
%%DATADIR%%/help/note/send
%%DATADIR%%/help/note/sent
%%DATADIR%%/help/note/service
%%DATADIR%%/help/note/spy
%%DATADIR%%/help/note/stats
%%DATADIR%%/help/note/user
%%DATADIR%%/help/note/waitfor
%%DATADIR%%/help/note/wall
%%DATADIR%%/help/note/wallops
%%DATADIR%%/help/notepad
%%DATADIR%%/help/notice
%%DATADIR%%/help/notify
%%DATADIR%%/help/nprot
%%DATADIR%%/help/nslookup
%%DATADIR%%/help/ntfymode
%%DATADIR%%/help/nwhois
%%DATADIR%%/help/on/action
%%DATADIR%%/help/on/cdcc_plist
%%DATADIR%%/help/on/cdcc_plist_footer
%%DATADIR%%/help/on/cdcc_plist_header
%%DATADIR%%/help/on/channel_nick
%%DATADIR%%/help/on/channel_signoff
%%DATADIR%%/help/on/channel_synch
%%DATADIR%%/help/on/channel_wallop
%%DATADIR%%/help/on/connect
%%DATADIR%%/help/on/ctcp
%%DATADIR%%/help/on/ctcp_reply
%%DATADIR%%/help/on/dcc_chat
%%DATADIR%%/help/on/dcc_list
%%DATADIR%%/help/on/dcc_list_footer
%%DATADIR%%/help/on/dcc_list_header
%%DATADIR%%/help/on/dcc_raw
%%DATADIR%%/help/on/disconnect
%%DATADIR%%/help/on/exec
%%DATADIR%%/help/on/exec_errors
%%DATADIR%%/help/on/exec_exit
%%DATADIR%%/help/on/exec_prompt
%%DATADIR%%/help/on/flood
%%DATADIR%%/help/on/help
%%DATADIR%%/help/on/hook
%%DATADIR%%/help/on/idle
%%DATADIR%%/help/on/input
%%DATADIR%%/help/on/invite
%%DATADIR%%/help/on/join
%%DATADIR%%/help/on/join_me
%%DATADIR%%/help/on/leave
%%DATADIR%%/help/on/list
%%DATADIR%%/help/on/mail
%%DATADIR%%/help/on/mode
%%DATADIR%%/help/on/msg
%%DATADIR%%/help/on/msg_group
%%DATADIR%%/help/on/names
%%DATADIR%%/help/on/nickname
%%DATADIR%%/help/on/note
%%DATADIR%%/help/on/notice
%%DATADIR%%/help/on/notify_signoff
%%DATADIR%%/help/on/notify_signoff_uh
%%DATADIR%%/help/on/notify_signon
%%DATADIR%%/help/on/notify_signon_uh
%%DATADIR%%/help/on/numeric
%%DATADIR%%/help/on/on
%%DATADIR%%/help/on/public
%%DATADIR%%/help/on/public_msg
%%DATADIR%%/help/on/public_notice
%%DATADIR%%/help/on/public_other
%%DATADIR%%/help/on/raw_irc
%%DATADIR%%/help/on/raw_send
%%DATADIR%%/help/on/send_action
%%DATADIR%%/help/on/send_ctcp
%%DATADIR%%/help/on/send_dcc_chat
%%DATADIR%%/help/on/send_msg
%%DATADIR%%/help/on/send_notice
%%DATADIR%%/help/on/send_public
%%DATADIR%%/help/on/serial_numbers
%%DATADIR%%/help/on/server_notice
%%DATADIR%%/help/on/signoff
%%DATADIR%%/help/on/timer
%%DATADIR%%/help/on/topic
%%DATADIR%%/help/on/wall
%%DATADIR%%/help/on/wallop
%%DATADIR%%/help/on/who
%%DATADIR%%/help/on/window
%%DATADIR%%/help/on/window_kill
%%DATADIR%%/help/on/window_swap
%%DATADIR%%/help/op
%%DATADIR%%/help/oper
%%DATADIR%%/help/orignick
%%DATADIR%%/help/origntime
%%DATADIR%%/help/ov
%%DATADIR%%/help/p
%%DATADIR%%/help/parsekey
%%DATADIR%%/help/part
%%DATADIR%%/help/passwd
%%DATADIR%%/help/ping
%%DATADIR%%/help/playback
%%DATADIR%%/help/query
%%DATADIR%%/help/quit
%%DATADIR%%/help/quote
%%DATADIR%%/help/ranlk
%%DATADIR%%/help/rbind
%%DATADIR%%/help/re
%%DATADIR%%/help/reconnect
%%DATADIR%%/help/redirect
%%DATADIR%%/help/rehash
%%DATADIR%%/help/reload
%%DATADIR%%/help/rembk
%%DATADIR%%/help/remchan
%%DATADIR%%/help/remf
%%DATADIR%%/help/remfchan
%%DATADIR%%/help/remfflag
%%DATADIR%%/help/remlog
%%DATADIR%%/help/remmon
%%DATADIR%%/help/remn
%%DATADIR%%/help/rems
%%DATADIR%%/help/remw
%%DATADIR%%/help/repword
%%DATADIR%%/help/restart
%%DATADIR%%/help/rules
%%DATADIR%%/help/s
%%DATADIR%%/help/save
%%DATADIR%%/help/say
%%DATADIR%%/help/sb
%%DATADIR%%/help/scrollz/copyright
%%DATADIR%%/help/send
%%DATADIR%%/help/sendline
%%DATADIR%%/help/server
%%DATADIR%%/help/servlist
%%DATADIR%%/help/servnotice
%%DATADIR%%/help/set/always_split_biggest
%%DATADIR%%/help/set/auto_reconnect
%%DATADIR%%/help/set/auto_reconnect_channels
%%DATADIR%%/help/set/auto_unmark_away
%%DATADIR%%/help/set/auto_whowas
%%DATADIR%%/help/set/away_file
%%DATADIR%%/help/set/background_colour
%%DATADIR%%/help/set/beep
%%DATADIR%%/help/set/beep_max
%%DATADIR%%/help/set/beep_on_mail
%%DATADIR%%/help/set/beep_on_msg
%%DATADIR%%/help/set/beep_when_away
%%DATADIR%%/help/set/bold_video
%%DATADIR%%/help/set/chanlog_strip_ansi
%%DATADIR%%/help/set/channel_name_width
%%DATADIR%%/help/set/client_information
%%DATADIR%%/help/set/clock
%%DATADIR%%/help/set/clock_24hour
%%DATADIR%%/help/set/clock_alarm
%%DATADIR%%/help/set/cmdchars
%%DATADIR%%/help/set/command_mode
%%DATADIR%%/help/set/continued_line
%%DATADIR%%/help/set/ctcp_reply_backlog_seconds
%%DATADIR%%/help/set/ctcp_reply_flood_size
%%DATADIR%%/help/set/ctcp_reply_ignore_seconds
%%DATADIR%%/help/set/dcc_block_size
%%DATADIR%%/help/set/dcc_host
%%DATADIR%%/help/set/dcc_ports
%%DATADIR%%/help/set/debug
%%DATADIR%%/help/set/decrypt_program
%%DATADIR%%/help/set/default_protocol
%%DATADIR%%/help/set/display
%%DATADIR%%/help/set/display_ansi
%%DATADIR%%/help/set/display_encoding
%%DATADIR%%/help/set/eight_bit_characters
%%DATADIR%%/help/set/encrypt_pad_msgs
%%DATADIR%%/help/set/encrypt_pad_public
%%DATADIR%%/help/set/encrypt_program
%%DATADIR%%/help/set/exec_protection
%%DATADIR%%/help/set/flood_after
%%DATADIR%%/help/set/flood_rate
%%DATADIR%%/help/set/flood_users
%%DATADIR%%/help/set/flood_warning
%%DATADIR%%/help/set/foreground_colour
%%DATADIR%%/help/set/full_status_line
%%DATADIR%%/help/set/help_pager
%%DATADIR%%/help/set/help_path
%%DATADIR%%/help/set/help_prompt
%%DATADIR%%/help/set/help_window
%%DATADIR%%/help/set/hide_channel_keys
%%DATADIR%%/help/set/hide_private_channels
%%DATADIR%%/help/set/high_ascii
%%DATADIR%%/help/set/highlight_char
%%DATADIR%%/help/set/history
%%DATADIR%%/help/set/history_file
%%DATADIR%%/help/set/hold_mode
%%DATADIR%%/help/set/hold_mode_max
%%DATADIR%%/help/set/hyper_dcc
%%DATADIR%%/help/set/indent
%%DATADIR%%/help/set/input_aliases
%%DATADIR%%/help/set/input_encoding
%%DATADIR%%/help/set/input_prompt
%%DATADIR%%/help/set/input_prompt_shift_new
%%DATADIR%%/help/set/input_protection
%%DATADIR%%/help/set/insert_mode
%%DATADIR%%/help/set/inverse_video
%%DATADIR%%/help/set/irc_encoding
%%DATADIR%%/help/set/irchost
%%DATADIR%%/help/set/iso2022_support
%%DATADIR%%/help/set/lastlog
%%DATADIR%%/help/set/lastlog_ansi
%%DATADIR%%/help/set/lastlog_level
%%DATADIR%%/help/set/load_path
%%DATADIR%%/help/set/log
%%DATADIR%%/help/set/logfile
%%DATADIR%%/help/set/mail
%%DATADIR%%/help/set/make_notice_msg
%%DATADIR%%/help/set/max_modes
%%DATADIR%%/help/set/max_recursions
%%DATADIR%%/help/set/max_wallop_nicks
%%DATADIR%%/help/set/menu
%%DATADIR%%/help/set/minimum_servers
%%DATADIR%%/help/set/minimum_users
%%DATADIR%%/help/set/netsplit_time
%%DATADIR%%/help/set/no_ask_nickname
%%DATADIR%%/help/set/no_ctcp_flood
%%DATADIR%%/help/set/notify_handler
%%DATADIR%%/help/set/notify_level
%%DATADIR%%/help/set/notify_on_termination
%%DATADIR%%/help/set/notify_show_name
%%DATADIR%%/help/set/notify_string
%%DATADIR%%/help/set/novice
%%DATADIR%%/help/set/old_encrypt_program
%%DATADIR%%/help/set/pause_after_motd
%%DATADIR%%/help/set/rate_limit_join
%%DATADIR%%/help/set/realname
%%DATADIR%%/help/set/same_window_only
%%DATADIR%%/help/set/save_encryption_keys
%%DATADIR%%/help/set/scroll
%%DATADIR%%/help/set/scroll_lines
%%DATADIR%%/help/set/scrollz_string
%%DATADIR%%/help/set/send_ignore_msg
%%DATADIR%%/help/set/send_userhost_on_nick_in_use
%%DATADIR%%/help/set/set
%%DATADIR%%/help/set/shell
%%DATADIR%%/help/set/shell_flags
%%DATADIR%%/help/set/shell_limit
%%DATADIR%%/help/set/show_away_once
%%DATADIR%%/help/set/show_channel_names
%%DATADIR%%/help/set/show_end_of_msgs
%%DATADIR%%/help/set/show_numerics
%%DATADIR%%/help/set/show_status_all
%%DATADIR%%/help/set/show_who_hopcount
%%DATADIR%%/help/set/ssl_ca_file
%%DATADIR%%/help/set/ssl_priority_string
%%DATADIR%%/help/set/ssl_verify_certificate
%%DATADIR%%/help/set/stamp_format
%%DATADIR%%/help/set/status_away
%%DATADIR%%/help/set/status_channel
%%DATADIR%%/help/set/status_channelcount
%%DATADIR%%/help/set/status_chanop
%%DATADIR%%/help/set/status_clock
%%DATADIR%%/help/set/status_dquery
%%DATADIR%%/help/set/status_format
%%DATADIR%%/help/set/status_hold
%%DATADIR%%/help/set/status_hold_lines
%%DATADIR%%/help/set/status_insert
%%DATADIR%%/help/set/status_lines
%%DATADIR%%/help/set/status_loadavg
%%DATADIR%%/help/set/status_mail
%%DATADIR%%/help/set/status_mode
%%DATADIR%%/help/set/status_notify
%%DATADIR%%/help/set/status_notify_repw_end_var
%%DATADIR%%/help/set/status_notify_repw_start_var
%%DATADIR%%/help/set/status_oper
%%DATADIR%%/help/set/status_overwrite
%%DATADIR%%/help/set/status_query
%%DATADIR%%/help/set/status_reverse
%%DATADIR%%/help/set/status_scrolled
%%DATADIR%%/help/set/status_scrolled_lines
%%DATADIR%%/help/set/status_server
%%DATADIR%%/help/set/status_umode
%%DATADIR%%/help/set/status_uptime
%%DATADIR%%/help/set/status_user
%%DATADIR%%/help/set/status_voice
%%DATADIR%%/help/set/status_window
%%DATADIR%%/help/set/suppress_server_motd
%%DATADIR%%/help/set/tab_max
%%DATADIR%%/help/set/trace
%%DATADIR%%/help/set/truncate_public_channel
%%DATADIR%%/help/set/underline_video
%%DATADIR%%/help/set/url_buffer_size
%%DATADIR%%/help/set/user_information
%%DATADIR%%/help/set/user_wallops
%%DATADIR%%/help/set/username
%%DATADIR%%/help/set/verbose_ctcp
%%DATADIR%%/help/set/warn_of_ignores
%%DATADIR%%/help/set/xterm_geomoptstr
%%DATADIR%%/help/set/xterm_options
%%DATADIR%%/help/set/xterm_path
%%DATADIR%%/help/setaway
%%DATADIR%%/help/setback
%%DATADIR%%/help/settings
%%DATADIR%%/help/showaway
%%DATADIR%%/help/showchan
%%DATADIR%%/help/showidle
%%DATADIR%%/help/showkill
%%DATADIR%%/help/shownick
%%DATADIR%%/help/showsign
%%DATADIR%%/help/showuser
%%DATADIR%%/help/showwallop
%%DATADIR%%/help/signoff
%%DATADIR%%/help/sinfo
%%DATADIR%%/help/sleep
%%DATADIR%%/help/sping
%%DATADIR%%/help/squit
%%DATADIR%%/help/stamp
%%DATADIR%%/help/stats
%%DATADIR%%/help/sve
%%DATADIR%%/help/switch
%%DATADIR%%/help/t
%%DATADIR%%/help/tabkey
%%DATADIR%%/help/tban
%%DATADIR%%/help/terminate
%%DATADIR%%/help/time
%%DATADIR%%/help/timer
%%DATADIR%%/help/tkill
%%DATADIR%%/help/topic
%%DATADIR%%/help/topiclock
%%DATADIR%%/help/topicunlock
%%DATADIR%%/help/trace
%%DATADIR%%/help/type
%%DATADIR%%/help/umode
%%DATADIR%%/help/unban
%%DATADIR%%/help/unflash
%%DATADIR%%/help/url
%%DATADIR%%/help/urlcatch
%%DATADIR%%/help/userhost
%%DATADIR%%/help/users
%%DATADIR%%/help/ver
%%DATADIR%%/help/version
%%DATADIR%%/help/voice
%%DATADIR%%/help/w
%%DATADIR%%/help/wait
%%DATADIR%%/help/wall
%%DATADIR%%/help/wallops
%%DATADIR%%/help/which
%%DATADIR%%/help/while
%%DATADIR%%/help/who
%%DATADIR%%/help/whois
%%DATADIR%%/help/wholeft
%%DATADIR%%/help/whowas
%%DATADIR%%/help/wi
%%DATADIR%%/help/wii
%%DATADIR%%/help/window/add
%%DATADIR%%/help/window/addgroup
%%DATADIR%%/help/window/back
%%DATADIR%%/help/window/balance
%%DATADIR%%/help/window/bind
%%DATADIR%%/help/window/channel
%%DATADIR%%/help/window/create
%%DATADIR%%/help/window/delete
%%DATADIR%%/help/window/delgroup
%%DATADIR%%/help/window/double
%%DATADIR%%/help/window/goto
%%DATADIR%%/help/window/grow
%%DATADIR%%/help/window/hide
%%DATADIR%%/help/window/hide_others
%%DATADIR%%/help/window/hold_mode
%%DATADIR%%/help/window/kill
%%DATADIR%%/help/window/kill_others
%%DATADIR%%/help/window/lastlog_level
%%DATADIR%%/help/window/level
%%DATADIR%%/help/window/list
%%DATADIR%%/help/window/log
%%DATADIR%%/help/window/logfile
%%DATADIR%%/help/window/move
%%DATADIR%%/help/window/name
%%DATADIR%%/help/window/new
%%DATADIR%%/help/window/next
%%DATADIR%%/help/window/nostatus
%%DATADIR%%/help/window/notify
%%DATADIR%%/help/window/notify_level
%%DATADIR%%/help/window/number
%%DATADIR%%/help/window/pop
%%DATADIR%%/help/window/previous
%%DATADIR%%/help/window/prompt
%%DATADIR%%/help/window/push
%%DATADIR%%/help/window/query
%%DATADIR%%/help/window/refnum
%%DATADIR%%/help/window/remove
%%DATADIR%%/help/window/scroll
%%DATADIR%%/help/window/server
%%DATADIR%%/help/window/show
%%DATADIR%%/help/window/shrink
%%DATADIR%%/help/window/size
%%DATADIR%%/help/window/stack
%%DATADIR%%/help/window/sticky
%%DATADIR%%/help/window/swap
%%DATADIR%%/help/window/title
%%DATADIR%%/help/window/unbind
%%DATADIR%%/help/window/unname
%%DATADIR%%/help/window/window
%%DATADIR%%/help/wkill
%%DATADIR%%/help/ww
%%DATADIR%%/help/xecho
%%DATADIR%%/help/xtype
@dir %%DATADIR%%/script

Return to bug 207674

Lines 1-55 Link Here

(-)irc/scrollz/Makefile (-9 / +11 lines)
1	# Created by: Will Andrews <andrews@technologist.com>	1	# Created by: Will Andrews <andrews@technologist.com>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= scrollz	4	PORTNAME= ScrollZ
5	PORTVERSION= 2.2.3	5	PORTVERSION= 2.3
6	PORTREVISION= 1	6	DISTVERSIONPREFIX= ${PORTNAME}-
7	CATEGORIES= irc ipv6	7	CATEGORIES= irc ipv6
8	MASTER_SITES= http://www.netraam.net/scrollz/download/ \
9	http://BSDforge.com/projects/source/irc/scrollz/
10	DISTNAME= ScrollZ-${PORTVERSION}
11		8
12	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= freebsd@bitchx.org
13	COMMENT= Enhanced ircII client that supports scripts, colors, and more	10	COMMENT= Enhanced ircII client that supports scripts, colors, and more
14		11
15	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
16	LICENSE_FILE= ${WRKSRC}/COPYRIGHT	13	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
17		14
18	USES= gmake iconv ncurses	15	USES= gmake iconv ncurses
		16	USE_GITHUB= yes
19	GNU_CONFIGURE= yes	17	GNU_CONFIGURE= yes
20	CONFIGURE_ARGS= --enable-ipv6 --enable-regexp --enable-utf8
21		18
		19	DATADIR= ${PREFIX}/share/${PORTNAME:tl}
22	PLIST_SUB= SCROLLZ_VER="${PORTVERSION}"	20	PLIST_SUB= SCROLLZ_VER="${PORTVERSION}"
23		21
		22	OPTIONS_DEFINE= IPV6 REGEX UTF8
24	OPTIONS_RADIO= SSL	23	OPTIONS_RADIO= SSL
25	OPTIONS_RADIO_SSL= GNUTLS OPENSSL	24	OPTIONS_RADIO_SSL= GNUTLS OPENSSL
26	OPTIONS_DEFAULT= OPENSSL	25	OPTIONS_DEFAULT= OPENSSL REGEX UTF8
27		26
		27	IPV_CONFIGURE_ENABLE= ipv6
28	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls	28	GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
29	GNUTLS_USES= pkgconfig	29	GNUTLS_USES= pkgconfig
30	GNUTLS_CONFIGURE_ON= --with-ssl	30	GNUTLS_CONFIGURE_ON= --with-ssl
		31	REGEX_CONFIGURE_ENABLE= regexp
31	OPENSSL_USE= OPENSSL=yes	32	OPENSSL_USE= OPENSSL=yes
32	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}	33	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
		34	UTF8_CONFIGURE_ENABLE= utf8
33		35
34	.include <bsd.port.pre.mk>	36	.include <bsd.port.pre.mk>
35		37
36	.if !empty(ICONV_LIB)	38	.if !empty(ICONV_LIB)
37	CONFIGURE_ENV+=ac_cv_func_iconv_open=yes	39	CONFIGURE_ENV+=ac_cv_func_iconv_open=yes
38	.endif	40	.endif
39		41
40	post-patch:	42	post-patch:
41	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure	43	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
42		44
43	pre-build:	45	pre-build:
44	.if !defined(BATCH)	46	.if !defined(BATCH)
45	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \	47	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \
46	SZdist.c)	48	SZdist.c)
47	@(cd ${WRKSRC} && ./SZdist)	49	@(cd ${WRKSRC} && ./SZdist)
48	.endif	50	.endif
49		51
50	post-install:	52	post-install:
51	.for i in scrollz-${PORTVERSION} wservz	53	.for i in scrollz-${PORTVERSION} wservz
52	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}	54	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${i}
53	.endfor	55	.endfor
54		56
55	.include <bsd.port.post.mk>	57	.include <bsd.port.post.mk>

Lines 1-107 Link Here

(-)irc/scrollz/files/patch-Makefile.in (-3 / +4 lines)
1	--- Makefile.in.orig 2011-04-29 17:21:18.000000000 +0900	1	--- Makefile.in.orig 2011-04-29 17:21:18.000000000 +0900
2	+++ Makefile.in 2013-03-09 19:35:03.628110600 +0900	2	+++ Makefile.in 2013-03-09 19:35:03.628110600 +0900
3	@@ -31,14 +31,14 @@	3	@@ -31,14 +31,14 @@
4	# @(#)$Id: Makefile.in,v 1.23 2006-10-31 12:31:27 f Exp $	4	# @(#)$Id: Makefile.in,v 1.23 2006-10-31 12:31:27 f Exp $
5		5
6	# targets recognised by this makefile:	6	# targets recognised by this makefile:
7	-# all, everything - compiles ircii, ircio, ircflush and wserv	7	-# all, everything - compiles ircii, ircio, ircflush and wserv
8	+# all, everything - compiles ircii, ircio, ircflush and wservz	8	+# all, everything - compiles ircii, ircio, ircflush and wservz
9	# ircio - compiles ircio	9	# ircio - compiles ircio
10	# ircflush - compiles ircflush	10	# ircflush - compiles ircflush
11	-# wserv - compiles wserv	11	-# wserv - compiles wserv
12	-# install - installs ircii, ircio, ircflush and wserv	12	-# install - installs ircii, ircio, ircflush and wserv
13	+# wservz - compiles wservz	13	+# wservz - compiles wservz
14	+# install - installs ircii, ircio, ircflush and wservz	14	+# install - installs ircii, ircio, ircflush and wservz
15	# installirc - installs ircii	15	# installirc - installs ircii
16	# installio - installs ircio	16	# installio - installs ircio
17	-# installwserv - installs wserv	17	-# installwserv - installs wserv
18	+# installwservz - installs wservz	18	+# installwservz - installs wservz
19	# installflush - installs ircflush	19	# installflush - installs ircflush
20	# installscript - installs the scripts	20	# installscript - installs the scripts
21	# installhelp - installs the help files	21	# installhelp - installs the help files
22	@@ -50,8 +50,8 @@	22	@@ -50,9 +50,9 @@
23	prefix = @prefix@	23	prefix = @prefix@
24	exec_prefix = @exec_prefix@	24	exec_prefix = @exec_prefix@
25	bindir = @bindir@	25	bindir = @bindir@
26	-sharedir = @prefix@/share	26	-sharedir = @prefix@/share
27	-mandir = @prefix@/share/man/man1
28	+sharedir = @datadir@	27	+sharedir = @datadir@
		28	datarootdir = @datarootdir@
		29	-mandir = @mandir@
29	+mandir = @mandir@/man1	30	+mandir = @mandir@/man1
30		31
31	DESTDIR =	32	DESTDIR =
32		33
33	@@ -105,7 +105,7 @@	34	@@ -105,7 +105,7 @@
34		35
35	# This program allows you to use screen/xterm's to put new irc windows	36	# This program allows you to use screen/xterm's to put new irc windows
36	# on new screen/xterm windows.	37	# on new screen/xterm windows.
37	-INSTALL_WSERV = $(bindir)/wserv	38	-INSTALL_WSERV = $(bindir)/wserv
38	+INSTALL_WSERVZ = $(bindir)/wservz	39	+INSTALL_WSERVZ = $(bindir)/wservz
39		40
40	# This command will be used to install the irc help files. If you don't	41	# This command will be used to install the irc help files. If you don't
41	# want to install them, replace with the following:	42	# want to install them, replace with the following:
42	@@ -126,14 +126,13 @@	43	@@ -126,14 +126,13 @@
43	VERSION = @VERSION@	44	VERSION = @VERSION@
44		45
45	SHELL = /bin/sh	46	SHELL = /bin/sh
46	-MAKE = make $(MFLAGS)	47	-MAKE = make $(MFLAGS)
47	MFLAGS ='CC=$(CC)' \	48	MFLAGS ='CC=$(CC)' \
48	'CFLAGS=$(CFLAGS)' \	49	'CFLAGS=$(CFLAGS)' \
49	'DEFS=$(DEFS)' \	50	'DEFS=$(DEFS)' \
50	'HELP_DIR=$(HELP_DIR)' \	51	'HELP_DIR=$(HELP_DIR)' \
51	'INSTALL_IRC=$(INSTALL_IRC)' \	52	'INSTALL_IRC=$(INSTALL_IRC)' \
52	'INSTALL_IRCIO=$(INSTALL_IRCIO)' \	53	'INSTALL_IRCIO=$(INSTALL_IRCIO)' \
53	- 'INSTALL_WSERV=$(INSTALL_WSERV)' \	54	- 'INSTALL_WSERV=$(INSTALL_WSERV)' \
54	+ 'INSTALL_WSERVZ=$(INSTALL_WSERVZ)' \	55	+ 'INSTALL_WSERVZ=$(INSTALL_WSERVZ)' \
55	'IRCSHARE=$(IRCSHARE)' \	56	'IRCSHARE=$(IRCSHARE)' \
56	'IRCPATH=$(IRC_PATH)' \	57	'IRCPATH=$(IRC_PATH)' \
57	'LDFLAGS=$(LDFLAGS)' \	58	'LDFLAGS=$(LDFLAGS)' \
58	@@ -143,32 +142,23 @@	59	@@ -143,32 +142,23 @@
59	'LN=$(LN)' \	60	'LN=$(LN)' \
60	'RM=$(RM)'	61	'RM=$(RM)'
61		62
62	-all: scrollz scrollz.1	63	-all: scrollz scrollz.1
63	+all: scrollz scrollz.1 wservz	64	+all: scrollz scrollz.1 wservz
64		65
65	-install: all installbin installdirs installman installhelp	66	-install: all installbin installdirs installman installhelp
66	+install: all installbin installwservz installdirs installman installhelp	67	+install: all installbin installwservz installdirs installman installhelp
67		68
68	-scrollz: source/Makefile Makefile	69	-scrollz: source/Makefile Makefile
69	- @cd source; $(MAKE) all	70	- @cd source; $(MAKE) all
70	+scrollz ircio ircflush wservz: source/Makefile Makefile	71	+scrollz ircio ircflush wservz: source/Makefile Makefile
71	+ $(MAKE) -C source $(MFLAGS) $@	72	+ $(MAKE) -C source $(MFLAGS) $@
72		73
73	scrollz.1: scrollz.1.in	74	scrollz.1: scrollz.1.in
74	sed -e "s,SHAREDIR,$(IRCSHARE)," < scrollz.1.in > scrollz.1	75	sed -e "s,SHAREDIR,$(IRCSHARE)," < scrollz.1.in > scrollz.1
75		76
76	installeverything: install installman installflush installio \	77	installeverything: install installman installflush installio \
77	- installwserv installhelp	78	- installwserv installhelp
78	+ installwservz installhelp	79	+ installwservz installhelp
79		80
80	-everything: all ircflush ircio wserv	81	-everything: all ircflush ircio wserv
81	+everything: all ircflush ircio wservz	82	+everything: all ircflush ircio wservz
82		83
83	ircserv: ircio	84	ircserv: ircio
84		85
85	-ircio: source/Makefile	86	-ircio: source/Makefile
86	- @cd source; $(MAKE) ircio	87	- @cd source; $(MAKE) ircio
87	-	88	-
88	-ircflush: source/ircflush.c source/Makefile	89	-ircflush: source/ircflush.c source/Makefile
89	- @cd source; $(MAKE) ircflush	90	- @cd source; $(MAKE) ircflush
90	-	91	-
91	-wserv: source/wserv.c source/term.c source/Makefile	92	-wserv: source/wserv.c source/term.c source/Makefile
92	- @cd source; $(MAKE) wserv	93	- @cd source; $(MAKE) wserv
93	-	94	-
94	installbin: installirc	95	installbin: installirc
95		96
96	installirc: scrollz installdirs	97	installirc: scrollz installdirs
97	@@ -189,8 +179,8 @@	98	@@ -189,8 +179,8 @@
98	installflush: ircflush installdirs	99	installflush: ircflush installdirs
99	$(INSTALL) source/ircflush $(DESTDIR)/$(INSTALL_IRCFLUSH)	100	$(INSTALL) source/ircflush $(DESTDIR)/$(INSTALL_IRCFLUSH)
100		101
101	-installwserv: wserv installdirs	102	-installwserv: wserv installdirs
102	- $(INSTALL) source/wserv $(DESTDIR)/$(INSTALL_WSERV)	103	- $(INSTALL) source/wserv $(DESTDIR)/$(INSTALL_WSERV)
103	+installwservz: wservz installdirs	104	+installwservz: wservz installdirs
104	+ $(INSTALL) source/wservz $(DESTDIR)/$(INSTALL_WSERVZ)	105	+ $(INSTALL) source/wservz $(DESTDIR)/$(INSTALL_WSERVZ)
105		106
106	installdirs:	107	installdirs:
107	umask 022; ./mkinstalldirs $(DESTDIR)/$(IRCSHARE) $(DESTDIR)/$(bindir) \	108	umask 022; ./mkinstalldirs $(DESTDIR)/$(IRCSHARE) $(DESTDIR)/$(bindir) \