Date: Mon, 5 Aug 2013 02:40:48 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324255 - in head/irc/scrollz: . files Message-ID: <201308050240.r752emqG097694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Aug 5 02:40:48 2013 New Revision: 324255 URL: http://svnweb.freebsd.org/changeset/ports/324255 Log: - 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 Modified: head/irc/scrollz/Makefile head/irc/scrollz/files/patch-Makefile.in head/irc/scrollz/files/patch-source-Makefile.in head/irc/scrollz/pkg-plist Modified: head/irc/scrollz/Makefile ============================================================================== --- head/irc/scrollz/Makefile Sun Aug 4 23:25:18 2013 (r324254) +++ head/irc/scrollz/Makefile Mon Aug 5 02:40:48 2013 (r324255) @@ -14,25 +14,22 @@ COMMENT= Enhanced ircII client that supp 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 Modified: head/irc/scrollz/files/patch-Makefile.in ============================================================================== --- head/irc/scrollz/files/patch-Makefile.in Sun Aug 4 23:25:18 2013 (r324254) +++ head/irc/scrollz/files/patch-Makefile.in Mon Aug 5 02:40:48 2013 (r324255) @@ -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) Modified: head/irc/scrollz/files/patch-source-Makefile.in ============================================================================== --- head/irc/scrollz/files/patch-source-Makefile.in Sun Aug 4 23:25:18 2013 (r324254) +++ head/irc/scrollz/files/patch-source-Makefile.in Mon Aug 5 02:40:48 2013 (r324255) @@ -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 Modified: head/irc/scrollz/pkg-plist ============================================================================== --- head/irc/scrollz/pkg-plist Sun Aug 4 23:25:18 2013 (r324254) +++ head/irc/scrollz/pkg-plist Mon Aug 5 02:40:48 2013 (r324255) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308050240.r752emqG097694>