update to ports/irc/scrollz Fix: PORTNAME= scrollz -PORTVERSION= 1.9.5 +PORTVERSION= 1.9.98.1 CATEGORIES= irc ipv6 -MASTER_SITES= ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ +MASTER_SITES= ftp://ftp.scrollz.com/pub/ScrollZ/source/ \ + ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ DISTNAME= ScrollZ-${PORTVERSION} MAINTAINER= damm@yazzy.org @@ -18,13 +19,20 @@ USE_PERL5_BUILD=yes IS_INTERACTIVE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-ipv6 --with-ssl +CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp MAKE_ENV+= IRCLIB="${PREFIX}/share/scrollz" PLIST_SUB+= SCROLLZ_VER="${PORTVERSION}" MAN1= scrollz.1 + +.if defined(WITH_SSL) +USE_GNUTLS= YES +BUILD_DEPENDS+=${LOCALBASE}/lib/libgnutls.a:${PORTSDIR}/security/gnutls +LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-ssl +.endif post-patch: @${PERL} -pi -e 's!^IRCLIB =!IRCLIB ?=!' ${WRKSRC}/Makefile.in How-To-Repeat: apply diff
Responsible Changed From-To: freebsd-ports-bugs->garga I'll take it.
Your patch is broken, it doesn't apply fine. # patch < pr-patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -urN scrollz-old/Makefile scrollz/Makefile |--- scrollz-old/Makefile Wed May 3 14:37:49 2006 |+++ scrollz/Makefile Wed May 3 15:45:59 2006 -------------------------- Patching file scrollz/Makefile using Plan A... Hunk #1 failed at 6. patch: **** malformed patch at line 38: diff -urN scrollz-old/distinfo scrollz/distinfo Exit 1 Could you please generate another one? Thanks -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc
State Changed From-To: open->feedback Patch doesn't apply.
See updated diff.. not sure what happened.
On Fri, 12 May 2006 07:56:16 -0300 Renato Botelho <garga@FreeBSD.org> wrote: > Your patch is broken, it doesn't apply fine. > > # patch < pr-patch > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN scrollz-old/Makefile scrollz/Makefile > |--- scrollz-old/Makefile Wed May 3 14:37:49 2006 > |+++ scrollz/Makefile Wed May 3 15:45:59 2006 > -------------------------- > Patching file scrollz/Makefile using Plan A... > Hunk #1 failed at 6. > patch: **** malformed patch at line 38: diff -urN > scrollz-old/distinfo scrollz/distinfo > Exit 1 > > Could you please generate another one? > > Thanks See attached, i'm not sure what happened if the paste guff'd it, or what. patch -p0 < pr-patch
Applied fine... Since i'm here, i proposed you following patch that have interesting changes. Most important are: * Remove Perl dependency, since it's not needed * Remove IS_INTERACTIVE since this port respect BATCH * portlint(1) Please, take a look and tell me if you approve this. Thanks ---------------------------------------------------------- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/irc/scrollz/Makefile,v retrieving revision 1.30 diff -u -r1.30 Makefile --- Makefile 6 Apr 2006 12:07:19 -0000 1.30 +++ Makefile 12 May 2006 17:17:59 -0000 @@ -6,19 +6,18 @@ # PORTNAME= scrollz -PORTVERSION= 1.9.5 +PORTVERSION= 1.9.98.1 CATEGORIES= irc ipv6 -MASTER_SITES= ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ +MASTER_SITES= ftp://ftp.scrollz.com/pub/ScrollZ/source/ \ + ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ DISTNAME= ScrollZ-${PORTVERSION} MAINTAINER= damm@yazzy.org COMMENT= Enhanced ircII client that supports scripts, colors, and more USE_GMAKE= yes -USE_PERL5_BUILD=yes -IS_INTERACTIVE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-ipv6 --with-ssl +CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp MAKE_ENV+= IRCLIB="${PREFIX}/share/scrollz" @@ -26,13 +25,16 @@ MAN1= scrollz.1 -post-patch: - @${PERL} -pi -e 's!^IRCLIB =!IRCLIB ?=!' ${WRKSRC}/Makefile.in +.if defined(WITH_SSL) +USE_GNUTLS= YES +BUILD_DEPENDS+= ${LOCALBASE}/lib/libgnutls.a:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls +CONFIGURE_ARGS+= --with-ssl +.endif pre-build: .if !defined(BATCH) - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist \ - SZdist.c) + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o SZdist SZdist.c) @(cd ${WRKSRC}; ./SZdist) .endif Index: distinfo =================================================================== RCS file: /home/pcvs/ports/irc/scrollz/distinfo,v retrieving revision 1.13 diff -u -r1.13 distinfo --- distinfo 22 Jan 2006 12:38:13 -0000 1.13 +++ distinfo 12 May 2006 17:17:59 -0000 @@ -1,3 +1,3 @@ -MD5 (ScrollZ-1.9.5.tar.gz) = 14b4bde509eefb6254d8ccff72b8b7a3 -SHA256 (ScrollZ-1.9.5.tar.gz) = 1cefb7303b5123469793e6ef2fc3cd057c3ff76916a9eb31fa478c9d5dedb6db -SIZE (ScrollZ-1.9.5.tar.gz) = 906167 +MD5 (ScrollZ-1.9.98.1.tar.gz) = 9296f5650f5457e7a2e26c953cfeb472 +SHA256 (ScrollZ-1.9.98.1.tar.gz) = 86bc4bab6e1925da9587b47cd214b11cddfd51d7a2a9d861a5ee22f2574a0625 +SIZE (ScrollZ-1.9.98.1.tar.gz) = 896927 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/irc/scrollz/pkg-plist,v retrieving revision 1.7 diff -u -r1.7 pkg-plist --- pkg-plist 6 Apr 2006 12:07:19 -0000 1.7 +++ pkg-plist 12 May 2006 17:17:59 -0000 @@ -322,7 +322,6 @@ %%DATADIR%%/help/set/status_window %%DATADIR%%/help/set/suppress_server_motd %%DATADIR%%/help/set/tab_max -%%DATADIR%%/help/set/translation %%DATADIR%%/help/set/truncate_public_channel %%DATADIR%%/help/set/underline_video %%DATADIR%%/help/set/use_old_msg @@ -682,41 +681,10 @@ %%DATADIR%%/help/ww %%DATADIR%%/help/xecho %%DATADIR%%/help/xtype -%%DATADIR%%/translation/ASCII -%%DATADIR%%/translation/CP437 -%%DATADIR%%/translation/CP850 -%%DATADIR%%/translation/DANISH -%%DATADIR%%/translation/DEC_MCS -%%DATADIR%%/translation/DG_MCS -%%DATADIR%%/translation/DUTCH -%%DATADIR%%/translation/FINNISH -%%DATADIR%%/translation/FRENCH -%%DATADIR%%/translation/FRENCH_CANADIAN -%%DATADIR%%/translation/GERMAN -%%DATADIR%%/translation/HP_MCS -%%DATADIR%%/translation/IRV -%%DATADIR%%/translation/ITALIAN -%%DATADIR%%/translation/JIS -%%DATADIR%%/translation/MACINTOSH -%%DATADIR%%/translation/NEXT -%%DATADIR%%/translation/NORWEGIAN_1 -%%DATADIR%%/translation/NORWEGIAN_2 -%%DATADIR%%/translation/POLISH -%%DATADIR%%/translation/POLISH_NOPL -%%DATADIR%%/translation/PORTUGUESE -%%DATADIR%%/translation/PORTUGUESE_COM -%%DATADIR%%/translation/RUSSIAN -%%DATADIR%%/translation/RUSSIAN_ALT -%%DATADIR%%/translation/RUSSIAN_WIN -%%DATADIR%%/translation/SPANISH -%%DATADIR%%/translation/SWEDISH -%%DATADIR%%/translation/SWEDISH_NAMES -%%DATADIR%%/translation/SWEDISH_NAMES_COM -%%DATADIR%%/translation/SWISS -%%DATADIR%%/translation/UNITED_KINGDOM -%%DATADIR%%/translation/UNITED_KINGDOM_COM +%%DATADIR%%/help/set/display_encoding +%%DATADIR%%/help/set/input_encoding +%%DATADIR%%/help/set/irc_encoding @exec mkdir %D/%%DATADIR%%/script -@dirrmtry %%DATADIR%%/translation @dirrmtry %%DATADIR%%/script @dirrmtry %%DATADIR%%/help/bind @dirrmtry %%DATADIR%%/help/alias ---------------------------------------------------------- -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc You need more time; and you probably always will.
Sounds good, I'll work on fixing the 'BATCH' portion as it used to respect it. and as far as Perl, never used it it was there before hand, and since Perl was in base I never worried. Thanks again, Scott On Fri, 12 May 2006 14:20:38 -0300 Renato Botelho <garga@FreeBSD.org> wrote: > Applied fine... > > Since i'm here, i proposed you following patch that have interesting > changes. Most important are: > > * Remove Perl dependency, since it's not needed > * Remove IS_INTERACTIVE since this port respect BATCH > * portlint(1) > > Please, take a look and tell me if you approve this. > > Thanks > ---------------------------------------------------------- > Index: Makefile > =================================================================== > RCS file: /home/pcvs/ports/irc/scrollz/Makefile,v > retrieving revision 1.30 > diff -u -r1.30 Makefile > --- Makefile 6 Apr 2006 12:07:19 -0000 1.30 > +++ Makefile 12 May 2006 17:17:59 -0000 > @@ -6,19 +6,18 @@ > # > > PORTNAME= scrollz > -PORTVERSION= 1.9.5 > +PORTVERSION= 1.9.98.1 > CATEGORIES= irc ipv6 > -MASTER_SITES= ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ > +MASTER_SITES= ftp://ftp.scrollz.com/pub/ScrollZ/source/ \ > + ftp://ftp.du.se/pub/mirrors/ScrollZ/source/ > DISTNAME= ScrollZ-${PORTVERSION} > > MAINTAINER= damm@yazzy.org > COMMENT= Enhanced ircII client that supports scripts, colors, > and more > USE_GMAKE= yes > -USE_PERL5_BUILD=yes > -IS_INTERACTIVE= yes > GNU_CONFIGURE= yes > -CONFIGURE_ARGS+= --enable-ipv6 --with-ssl > +CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp > > MAKE_ENV+= IRCLIB="${PREFIX}/share/scrollz" > > @@ -26,13 +25,16 @@ > > MAN1= scrollz.1 > > -post-patch: > - @${PERL} -pi -e 's!^IRCLIB =!IRCLIB ?=!' > ${WRKSRC}/Makefile.in +.if defined(WITH_SSL) > +USE_GNUTLS= YES > +BUILD_DEPENDS+= > ${LOCALBASE}/lib/libgnutls.a:${PORTSDIR}/security/gnutls > +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls > +CONFIGURE_ARGS+= --with-ssl +.endif > > pre-build: > .if !defined(BATCH) > - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o > SZdist \ > - SZdist.c) > + @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o > SZdist SZdist.c) @(cd ${WRKSRC}; ./SZdist) > .endif > > Index: distinfo > =================================================================== > RCS file: /home/pcvs/ports/irc/scrollz/distinfo,v > retrieving revision 1.13 > diff -u -r1.13 distinfo > --- distinfo 22 Jan 2006 12:38:13 -0000 1.13 > +++ distinfo 12 May 2006 17:17:59 -0000 > @@ -1,3 +1,3 @@ > -MD5 (ScrollZ-1.9.5.tar.gz) = 14b4bde509eefb6254d8ccff72b8b7a3 > -SHA256 (ScrollZ-1.9.5.tar.gz) = > 1cefb7303b5123469793e6ef2fc3cd057c3ff76916a9eb31fa478c9d5dedb6db > -SIZE (ScrollZ-1.9.5.tar.gz) = 906167 +MD5 (ScrollZ-1.9.98.1.tar.gz) > = 9296f5650f5457e7a2e26c953cfeb472 +SHA256 (ScrollZ-1.9.98.1.tar.gz) > = 86bc4bab6e1925da9587b47cd214b11cddfd51d7a2a9d861a5ee22f2574a0625 > +SIZE (ScrollZ-1.9.98.1.tar.gz) = 896927 Index: pkg-plist > =================================================================== > RCS file: /home/pcvs/ports/irc/scrollz/pkg-plist,v > retrieving revision 1.7 > diff -u -r1.7 pkg-plist > --- pkg-plist 6 Apr 2006 12:07:19 -0000 1.7 > +++ pkg-plist 12 May 2006 17:17:59 -0000 > @@ -322,7 +322,6 @@ > %%DATADIR%%/help/set/status_window > %%DATADIR%%/help/set/suppress_server_motd > %%DATADIR%%/help/set/tab_max > -%%DATADIR%%/help/set/translation > %%DATADIR%%/help/set/truncate_public_channel > %%DATADIR%%/help/set/underline_video > %%DATADIR%%/help/set/use_old_msg > @@ -682,41 +681,10 @@ > %%DATADIR%%/help/ww > %%DATADIR%%/help/xecho > %%DATADIR%%/help/xtype > -%%DATADIR%%/translation/ASCII > -%%DATADIR%%/translation/CP437 > -%%DATADIR%%/translation/CP850 > -%%DATADIR%%/translation/DANISH > -%%DATADIR%%/translation/DEC_MCS > -%%DATADIR%%/translation/DG_MCS > -%%DATADIR%%/translation/DUTCH > -%%DATADIR%%/translation/FINNISH > -%%DATADIR%%/translation/FRENCH > -%%DATADIR%%/translation/FRENCH_CANADIAN > -%%DATADIR%%/translation/GERMAN > -%%DATADIR%%/translation/HP_MCS > -%%DATADIR%%/translation/IRV > -%%DATADIR%%/translation/ITALIAN > -%%DATADIR%%/translation/JIS > -%%DATADIR%%/translation/MACINTOSH > -%%DATADIR%%/translation/NEXT > -%%DATADIR%%/translation/NORWEGIAN_1 > -%%DATADIR%%/translation/NORWEGIAN_2 > -%%DATADIR%%/translation/POLISH > -%%DATADIR%%/translation/POLISH_NOPL > -%%DATADIR%%/translation/PORTUGUESE > -%%DATADIR%%/translation/PORTUGUESE_COM > -%%DATADIR%%/translation/RUSSIAN > -%%DATADIR%%/translation/RUSSIAN_ALT > -%%DATADIR%%/translation/RUSSIAN_WIN > -%%DATADIR%%/translation/SPANISH > -%%DATADIR%%/translation/SWEDISH > -%%DATADIR%%/translation/SWEDISH_NAMES > -%%DATADIR%%/translation/SWEDISH_NAMES_COM > -%%DATADIR%%/translation/SWISS > -%%DATADIR%%/translation/UNITED_KINGDOM > -%%DATADIR%%/translation/UNITED_KINGDOM_COM > +%%DATADIR%%/help/set/display_encoding > +%%DATADIR%%/help/set/input_encoding > +%%DATADIR%%/help/set/irc_encoding > @exec mkdir %D/%%DATADIR%%/script > -@dirrmtry %%DATADIR%%/translation > @dirrmtry %%DATADIR%%/script > @dirrmtry %%DATADIR%%/help/bind > @dirrmtry %%DATADIR%%/help/alias > ---------------------------------------------------------- -- "What does one want when one is engaged in the sexual act? That everything around you give you its utter attention Think only of you, care only for you... Every man wants to be a tyrant when he fornicates"
State Changed From-To: feedback->closed Committed. Thanks!