Index: head/irc/scrollz/Makefile =================================================================== --- head/irc/scrollz/Makefile (revision 324254) +++ head/irc/scrollz/Makefile (revision 324255) @@ -1,50 +1,47 @@ # Created by: Will Andrews # $FreeBSD$ PORTNAME= scrollz PORTVERSION= 2.2.2 PORTREVISION= 2 CATEGORIES= irc ipv6 MASTER_SITES= http://www.netraam.net/scrollz/download/ \ http://www.scrollz.com/download/ DISTNAME= ScrollZ-${PORTVERSION} MAINTAINER= mdv@unsavoury.net COMMENT= Enhanced ircII client that supports scripts, colors, and more USES= gmake iconv ncurses GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp --enable-iconv +CONFIGURE_ARGS= --enable-ipv6 --enable-regexp --enable-iconv +MAKE_ENV= IRCLIB="${PREFIX}/share/scrollz" -MAKE_ENV+= IRCLIB="${PREFIX}/share/scrollz" -MAKE_JOBS_UNSAFE= yes +MAN1= scrollz.1 +PORTDATA= * PLIST_SUB+= SCROLLZ_VER="${PORTVERSION}" -PORTDATA= * OPTIONS_DEFAULT= OPENSSL OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL -MAN1= scrollz.1 - .include .if ${PORT_OPTIONS:MGNUTLS} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libgnutls.a:${PORTSDIR}/security/gnutls -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --with-ssl=${LOCALBASE} .endif .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .endif pre-build: .if !defined(BATCH) @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist SZdist.c) @(cd ${WRKSRC}; ./SZdist) .endif .include Index: head/irc/scrollz/files/patch-Makefile.in =================================================================== --- head/irc/scrollz/files/patch-Makefile.in (revision 324254) +++ head/irc/scrollz/files/patch-Makefile.in (revision 324255) @@ -1,85 +1,96 @@ --- 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 @@ +@@ -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,9 +143,9 @@ +@@ -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 -@@ -154,9 +154,9 @@ +-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 -@@ -166,8 +166,8 @@ - ircflush: source/ircflush.c source/Makefile - @cd source; $(MAKE) ircflush - +-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 -+wservz: source/wserv.c source/term.c source/Makefile -+ @cd source; $(MAKE) wservz - +- installbin: installirc -@@ -189,8 +189,8 @@ + 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) \ Index: head/irc/scrollz/files/patch-source-Makefile.in =================================================================== --- head/irc/scrollz/files/patch-source-Makefile.in (revision 324254) +++ head/irc/scrollz/files/patch-source-Makefile.in (revision 324255) @@ -1,29 +1,47 @@ --- source/Makefile.in.orig 2011-04-29 17:21:18.000000000 +0900 +++ source/Makefile.in 2013-03-09 19:07:14.372106954 +0900 +@@ -47,7 +47,7 @@ + INCLUDES = -I../include + + default: +- (cd ..;make) ++ $(MAKE) -C .. + + all: scrollz + +@@ -63,7 +63,7 @@ + $(RM) scrollz $(OBJECTS) + + install: scrollz +- cd ..; $(MAKE) install ++ $(MAKE) -C .. install + + # .o files needing special compilation flags + @@ -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: head/irc/scrollz/pkg-plist =================================================================== --- head/irc/scrollz/pkg-plist (revision 324254) +++ head/irc/scrollz/pkg-plist (revision 324255) @@ -1,5 +1,4 @@ bin/scrollz bin/scrollz-%%SCROLLZ_VER%% bin/wservz -@exec /bin/mkdir -p %%PREFIX%%/%%DATADIR%%/script -@dirrm %%DATADIR%%/script +@exec mkdir -p %D/%%DATADIR%%/script