From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Mar 9 15:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id B68ED8B0 for ; Sat, 9 Mar 2013 15:30:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id 99FB1942 for ; Sat, 9 Mar 2013 15:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r29FU0aj074065 for ; Sat, 9 Mar 2013 15:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r29FU0wi074064; Sat, 9 Mar 2013 15:30:00 GMT (envelope-from gnats) Resent-Date: Sat, 9 Mar 2013 15:30:00 GMT Resent-Message-Id: <201303091530.r29FU0wi074064@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Norikatsu Shigemura Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A616975F for ; Sat, 9 Mar 2013 15:24:51 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 96706906 for ; Sat, 9 Mar 2013 15:24:51 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r29FOpKo030446 for ; Sat, 9 Mar 2013 15:24:51 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id r29FOp7j030445; Sat, 9 Mar 2013 15:24:51 GMT (envelope-from nobody) Message-Id: <201303091524.r29FOp7j030445@red.freebsd.org> Date: Sat, 9 Mar 2013 15:24:51 GMT From: Norikatsu Shigemura To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/176786: [PATCH] Fix some problem on ports/irc/scrollz. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2013 15:30:00 -0000 >Number: 176786 >Category: ports >Synopsis: [PATCH] Fix some problem on ports/irc/scrollz. >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Mar 09 15:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Norikatsu Shigemura >Release: FreeBSD/amd64 9.1-R >Organization: FreeBSD Committer >Environment: FreeBSD www1067gj.sakura.ne.jp 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r245677: Sun Jan 20 10:20:37 JST 2013 nork@www1067gj.sakura.ne.jp:/usr/obj/usr/src/sys/NYARLATHOTEP amd64 >Description: ports/irc/scrollz has some implicitly dependencies on other ports, and is disabled '/WINDOW CREATE' feature. To fix these problem, I made a patch for ports/irc/scrollz. >How-To-Repeat: N/A >Fix: o Fix implicitly dependency on iconv and openssl. o OPTIONfy. o Enable '/WINDOW CREATE'. o Install wserv as wservz, to avoid conflict with ports/irc/ircII. o Bump PORTREVISION, accordingly. NOTE: I confirmed OK with ports/sysutils/screen, but NG with sysutils/tmux. Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 313710) +++ Makefile (working copy) @@ -7,7 +7,7 @@ PORTNAME= scrollz PORTVERSION= 2.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= irc ipv6 MASTER_SITES= http://www.netraam.net/scrollz/download/ \ http://www.scrollz.com/download/ @@ -16,9 +16,10 @@ MAINTAINER= mdv@unsavoury.net COMMENT= Enhanced ircII client that supports scripts, colors, and more +USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp +CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp --enable-iconv USE_NCURSES= yes MAKE_ENV+= IRCLIB="${PREFIX}/share/scrollz" @@ -26,16 +27,23 @@ PLIST_SUB+= SCROLLZ_VER="${PORTVERSION}" PORTDATA= * +OPTIONS_DEFAULT= OPENSSL +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= GNUTLS OPENSSL + MAN1= scrollz.1 -.if defined(WITH_SSL) +.include + +.if ${PORT_OPTIONS:MGNUTLS} BUILD_DEPENDS+= ${LOCALBASE}/lib/libgnutls.a:${PORTSDIR}/security/gnutls LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-ssl +CONFIGURE_ARGS+= --with-ssl=${LOCALBASE} .endif -.if defined(WITH_OPENSSL) -CONFIGURE_ARGS+= --with-openssl +.if ${PORT_OPTIONS:MOPENSSL} +USE_OPENSSL= yes +CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif pre-build: Index: files/patch-Makefile.in =================================================================== --- files/patch-Makefile.in (revision 0) +++ files/patch-Makefile.in (working copy) @@ -0,0 +1,85 @@ +--- 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 +@@ -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: +@@ -133,7 +133,7 @@ + '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,9 +143,9 @@ + '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 +@@ -154,9 +154,9 @@ + 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 + +@@ -166,8 +166,8 @@ + ircflush: source/ircflush.c source/Makefile + @cd source; $(MAKE) ircflush + +-wserv: source/wserv.c source/term.c source/Makefile +- @cd source; $(MAKE) wserv ++wservz: source/wserv.c source/term.c source/Makefile ++ @cd source; $(MAKE) wservz + + installbin: installirc + +@@ -189,8 +189,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) \ Index: files/patch-include-window.h =================================================================== --- files/patch-include-window.h (revision 0) +++ files/patch-include-window.h (working copy) @@ -0,0 +1,11 @@ +--- include/window.h.orig 2011-04-29 17:21:18.000000000 +0900 ++++ include/window.h 2013-03-09 18:47:08.841093765 +0900 +@@ -42,7 +42,7 @@ + * CREATE, that allows you to start new iscreen or xterm windows + * connected to the ircII client. + */ +-#undef WINDOW_CREATE ++#define WINDOW_CREATE + + #if defined(M_UNIX) || !defined(HAVE_SYS_UN_H) + #undef WINDOW_CREATE Index: files/patch-source-Makefile.in =================================================================== --- files/patch-source-Makefile.in (revision 0) +++ files/patch-source-Makefile.in (working copy) @@ -0,0 +1,29 @@ +--- source/Makefile.in.orig 2011-04-29 17:21:18.000000000 +0900 ++++ source/Makefile.in 2013-03-09 19:07:14.372106954 +0900 +@@ -86,7 +86,7 @@ + $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DTRANSLATION_PATH=\"$(TRANS_DIR)/\" -c translat.c + + screen.o: Makefile ../Makefile +- $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DWSERV_PATH=\"$(INSTALL_WSERV)\" -c screen.c ++ $(CC) $(CFLAGS) $(DEFS) $(PP_DEFS) $(INCLUDES) -DWSERV_PATH=\"$(INSTALL_WSERVZ)\" -c screen.c + + # auxiliary programs + +@@ -96,7 +96,7 @@ + ircio: $(IRCIO_OBJECTS) + $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) $(PPS_DEFS) -o $@ $(IRCIO_OBJECTS) $(LIBS) + +-wserv: $(WSERV_OBJECTS) ++wservz: $(WSERV_OBJECTS) + $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(DEFS) -o $@ $(WSERV_OBJECTS) $(LIBS) + + clean:: +@@ -106,7 +106,7 @@ + $(RM) ircio ircio.o newio.o + + clean:: +- $(RM) wserv wserv.o wterm.o wterm.c ++ $(RM) wservz wserv.o wterm.o wterm.c + + # extra junk + Index: pkg-plist =================================================================== --- pkg-plist (revision 313710) +++ pkg-plist (working copy) @@ -1,4 +1,5 @@ bin/scrollz bin/scrollz-%%SCROLLZ_VER%% +bin/wservz @exec /bin/mkdir -p %%PREFIX%%/%%DATADIR%%/script @dirrm %%DATADIR%%/script >Release-Note: >Audit-Trail: >Unformatted: