- Attempt to unbreak parallel (-jX) builds, remove MAKE_JOBS_UNSAFE

- Remove superfluous bdep in GnuTLS case, LIB_DEPENDS satisfies it;
  also switch to the new library specification format
- Correct pkg-plist; cleanup Makefile, sort the knobs while I'm here

4 files changed, 48 insertions, 23 deletions

diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index 9f2451836b1a..7164e4ed4c54 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -14,25 +14,22 @@ 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 <bsd.port.options.mk>
 
 .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
 
diff --git a/irc/scrollz/files/patch-Makefile.in b/irc/scrollz/files/patch-Makefile.in
index 4965aa807483..ddbe7d1b1ce9 100644
--- a/irc/scrollz/files/patch-Makefile.in
+++ b/irc/scrollz/files/patch-Makefile.in
@@ -28,7 +28,14 @@
  
  # 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)'		\
@@ -37,7 +44,7 @@
  	'IRCSHARE=$(IRCSHARE)'				\
  	'IRCPATH=$(IRC_PATH)'				\
  	'LDFLAGS=$(LDFLAGS)'				\
-@@ -143,9 +143,9 @@
+@@ -143,32 +142,23 @@
  	'LN=$(LN)'					\
  	'RM=$(RM)'
  
@@ -47,9 +54,12 @@
 -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 \
@@ -61,18 +71,19 @@
  
  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)
  
diff --git a/irc/scrollz/files/patch-source-Makefile.in b/irc/scrollz/files/patch-source-Makefile.in
index 9e05f2a181bd..6db7970cb4e4 100644
--- a/irc/scrollz/files/patch-source-Makefile.in
+++ b/irc/scrollz/files/patch-source-Makefile.in
@@ -1,5 +1,23 @@
 --- 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
  
diff --git a/irc/scrollz/pkg-plist b/irc/scrollz/pkg-plist
index c70f3a728177..ba73c4654f0d 100644
--- a/irc/scrollz/pkg-plist
+++ b/irc/scrollz/pkg-plist
@@ -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