> Okay, here goes...
> 
> The following diff solves every problem I am aware of; however, since
> steven pointed out that the port might not work properly on sparc64,
> testing on that platform is especially appreciated.
> 
> Changes since last version I sent:
> - revert license, it *cannot* be distributed on CD - and added a
>   comment explaining why this is so
> - install helper scripts in /usr/local
> - don't install mbox.5 and mmdf.5 (those conflict with mutt)
> - update DESCR (the nntp_only flavor is no more, helper scripts have
>   moved which may require some changes to configurations - note that the
>   old version installed configurations that expected helper scripts in
>   /usr/local by default, so unless people fixed that it will be correct
>   now)

not sure this is worth adding to DESCR...
and you probably mean /usr/local/bin

> Other changes from the current port (1.6.2):
> - shuffle master-sites - funet.fi doesn't have old versions
> - take maintainer
> - remove the nntp_only flavour, those few bytes aren't going to hurt
>   anyone
> - update to tin 1.8.2, fixing some security problems
> 
> Works for me, and apparently a slightly different version works for
> Giovanni, on i386. Again, testing on sparc64 would be highly
> appreciated [1].

your update looks basically okay to me. i have been using this version
of tin for 6 months or so without issues on i386.

oh, if you want those nntp_only packages to be updated to the regular
one, you can use a @pkgpath line in PLIST.

> 
> Cluebats are welcome, too.
> 
>               Joachim
> 
> [1] However, since tin seems to go to great lengths to be portable, and
> neither Debian nor NetBSD seem to have any restrictions on what
> architecture it will run on, I'd be somewhat surprised if it didn't
> work. Still, if Steven says so...
> 
> diff -Nurd /usr/ports/news/tin/Makefile /usr/ports/mystuff/news/tin/Makefile
> --- /usr/ports/news/tin/Makefile      Thu Dec  2 20:19:59 2004
> +++ /usr/ports/mystuff/news/tin/Makefile      Tue Jan 23 23:08:32 2007
> @@ -2,21 +2,26 @@
>  
>  COMMENT=     'threaded NNTP and spool based UseNet newsreader'
>  
> -DISTNAME=    tin-1.6.2
> +DISTNAME=    tin-${MAJORVERSION}.${PATCHLEVEL}
> +MAJORVERSION=        1.8
> +PATCHLEVEL=  2
>  CATEGORIES=  news
>  
> -MASTER_SITES=        ftp://ftp.tin.org/pub/news/clients/tin/stable/ \
> -             ftp://ftp.funet.fi/pub/unix/news/tin-unoff/stable/ \
> -             ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/stable/ \
> -             ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/stable/ \
> -             ftp://ftp.sunet.se/pub/news/readers/tin/stable/
> +MASTER_SITES=        
> ftp://ftp.tin.org/pub/news/clients/tin/v${MAJORVERSION}/ \
> +             
> ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${MAJORVERSION}/ \
> +             ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${MAJORVERSION}/ \
> +             ftp://ftp.sunet.se/pub/news/readers/tin/v${MAJORVERSION}/ \
> +             ftp://ftp.funet.fi/pub/unix/news/tin-unoff/
>  
>  HOMEPAGE=    http://www.tin.org/
>  
> -MAINTAINER=     Federico G. Schwindt <[EMAIL PROTECTED]>
> +MAINTAINER=  Joachim Schipper <[EMAIL PROTECTED]>
>  
>  MODULES=     devel/gettext
>  
> +# This software cannot be redistributed freely due to a few files having
> +# licenses that prohibit making money from redistribution - see 
> src/nntplib.c,
> +# vms/vms.c
>  PERMIT_PACKAGE_CDROM=        "no fee"
>  PERMIT_PACKAGE_FTP=  Yes
>  PERMIT_DISTFILES_CDROM=      "no fee"
> @@ -24,6 +29,7 @@
>  WANTLIB=             c ncurses
>  
>  CONFIGURE_STYLE=     gnu
> +# --with-x does not affect the build, but let's be safe.
>  CONFIGURE_ARGS+=     --with-ispell=${LOCALBASE}/bin/ispell \
>                       --without-metamail \
>                       --without-pgp \
> @@ -31,23 +37,16 @@
>                       --with-gpg=${LOCALBASE}/bin/gpg \
>                       --with-screen=ncurses \
>                       --with-pcre=${LOCALBASE} \
> +                     --with-libdir=${PREFIX}/lib/news \
> +                     --with-spooldir=/var/news \
>                       --enable-break-long-lines \
> -                     --enable-ipv6
> +                     --enable-ipv6 \
> +                     --without-x
>  CONFIGURE_ENV=       CPPFLAGS="-I${LOCALBASE}/include" \
>               LDFLAGS="-L${LOCALBASE}/lib"
>  
>  LIB_DEPENDS+=        pcre::devel/pcre \
>               utf8::misc/libutf8
> -
> -FLAVORS=     nntp_only
> -FLAVOR?=
> -
> -.if ${FLAVOR:L:Mnntp_only}
> -CONFIGURE_ARGS+=     --enable-nntp-only
> -.else
> -CONFIGURE_ARGS+=     --with-libdir=${PREFIX}/lib/news \
> -                     --with-spooldir=/var/news
> -.endif
>  
>  ALL_TARGET=  build
>  
> diff -Nurd /usr/ports/news/tin/distinfo /usr/ports/mystuff/news/tin/distinfo
> --- /usr/ports/news/tin/distinfo      Wed Jan  5 18:21:52 2005
> +++ /usr/ports/mystuff/news/tin/distinfo      Thu Jan  4 23:01:46 2007
> @@ -1,4 +1,4 @@
> -MD5 (tin-1.6.2.tar.gz) = 8f34747809b6fe5c135694fcbe2c8f46
> -RMD160 (tin-1.6.2.tar.gz) = 651a6709f09346c2276866968d1efcafefb5080e
> -SHA1 (tin-1.6.2.tar.gz) = f2113583c93105ca518fe4b56dc9d2825e6a15f5
> -SIZE (tin-1.6.2.tar.gz) = 1548753
> +MD5 (tin-1.8.2.tar.gz) = 397b6e22861d1ed4fc0fdb0e4a9f8876
> +RMD160 (tin-1.8.2.tar.gz) = cc72f22f4b85091b8968a63ef8b36568cb484c6f
> +SHA1 (tin-1.8.2.tar.gz) = 6a0b4505d9d769cb58dea483fadab8e86a08ec69
> +SIZE (tin-1.8.2.tar.gz) = 1996960
> diff -Nurd /usr/ports/news/tin/patches/patch-src_Makefile_in 
> /usr/ports/mystuff/news/tin/patches/patch-src_Makefile_in
> --- /usr/ports/news/tin/patches/patch-src_Makefile_in Tue Aug 19 18:48:00 2003
> +++ /usr/ports/mystuff/news/tin/patches/patch-src_Makefile_in Tue Jan 23 
> 22:20:54 2007
> @@ -1,60 +1,21 @@
> -$OpenBSD: patch-src_Makefile_in,v 1.2 2003/08/19 16:48:00 fgsch Exp $
> ---- src/Makefile.in.orig     2003-07-24 11:18:45.000000000 -0300
> -+++ src/Makefile.in  2003-08-19 13:47:24.000000000 -0300
> -@@ -36,6 +36,7 @@ VERSION = @VERSION@
> - 
> - SHELL               = /bin/sh
> - prefix              = @prefix@
> -+datadir             = @datadir@
> - exec_prefix = @exec_prefix@
> - top_srcdir  = @top_srcdir@
> - top_builddir        = ..
> -@@ -69,6 +70,7 @@ LIBS               = $(PCRE_LIBS) $(CANLIB) @LIBS@ @I
> - # Where do you want the binary & manual page installed?
> - DESTDIR     = @DESTDIR@
> - INS_BINARY_DIR      = @bindir@
> -+INS_DATA_DIR        = @datadir@/tin
> - INS_MANUAL_DIR      = @mandir@/man
> - INS_SYSDEF_DIR      = @TIN_DEFAULTS_DIR@
> - INS_MANUAL_EXT      = 1
> -@@ -318,16 +320,15 @@ help:
> - $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) \
> - $(DESTDIR)$(INS_MANUAL_DIR)5 \
> - $(DESTDIR)$(INS_BINARY_DIR) \
> -+$(DESTDIR)$(INS_DATA_DIR) \
> - $(DESTDIR)$(INS_SYSDEF_DIR) :
> -     $(top_srcdir)/mkdirs.sh $@
> - 
> --install_manpage: $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) 
> $(DESTDIR)$(INS_MANUAL_DIR)5
> -+install_manpage: $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) 
> $(DESTDIR)$(INS_MANUAL_DIR)5 $(DESTDIR)$(INS_DATA_DIR)
> -     @$(ECHO) "Installing $(PROJECT) manual pages to 
> $(DESTDIR)$(INS_MANUAL_DIR) ..."
> +$OpenBSD$
> +--- src/Makefile.in.orig     Sat Jul 16 21:49:36 2005
> ++++ src/Makefile.in  Tue Jan 23 22:20:33 2007
> +@@ -336,8 +336,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
>       @$(INSTALL) -m 444 $(DOCDIR)/tin.1 
> $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/$(PROJECT).$(INS_MANUAL_EXT)
>       @( $(CD) $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) && $(RM) -f 
> r$(PROJECT).$(INS_MANUAL_EXT) && $(LN) $(PROJECT).$(INS_MANUAL_EXT) 
> r$(PROJECT).$(INS_MANUAL_EXT) )
>       @$(INSTALL) -m 444 $(DOCDIR)/tin.5 
> $(DESTDIR)$(INS_MANUAL_DIR)5/$(PROJECT).5
>  -    @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; then $(INSTALL) -m 
> 444 $(DOCDIR)/mbox.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 ; else $(ECHO) "  
> ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mbox.5 - file already exists" ; fi
>  -    @-if test ! -f $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; then $(INSTALL) -m 
> 444 $(DOCDIR)/mmdf.5 $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 ; else $(ECHO) "  
> ... skipping $(DESTDIR)$(INS_MANUAL_DIR)5/mmdf.5 - file already exists" ; fi
>   
> - uninstall_manpage:
> + uninstall_manpage :
>       @$(ECHO) "Uninstalling $(PROJECT) manual page in 
> $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT) ..."
> -@@ -349,14 +350,14 @@ uninstall_sysdefs:
> -     @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/tin.defaults
> -     @-$(RM) -f $(DESTDIR)$(INS_SYSDEF_DIR)/mime.types
> +@@ -474,7 +472,7 @@ makecfg$X :                      $(SRCDIR)/makecfg.c \
> +                             $(INCDIR)/tin.h \
> +                             ../include/autoconf.h
> + @SHOW_CC@
> +-    @[EMAIL PROTECTED](BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) 
> $(BUILD_LDFLAGS) -o $@ makecfg.c #$(BUILD_LIBS)
> ++    @[EMAIL PROTECTED](BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) 
> $(BUILD_LDFLAGS) -o $@ makecfg.c $(BUILD_LIBS)
>   
> --install_helpers: $(DESTDIR)$(INS_BINARY_DIR) 
> $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)
> -+install_helpers: $(DESTDIR)$(INS_DATA_DIR)
> -     @$(ECHO) "Installing helper applications ..."
> --    @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; then 
> $(INSTALL) -m 755 $(TOLDIR)/url_handler.sh 
> $(DESTDIR)$(INS_BINARY_DIR)/url_handler.sh ; fi
> --    @-if test ! -f $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; then $(INSTALL) 
> -m 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_BINARY_DIR)/metamutt ; fi
> --    @$(INSTALL) -m 755 $(TOLDIR)/w2r.pl $(DESTDIR)$(INS_BINARY_DIR)/w2r.pl
> --    @$(INSTALL) -m 755 $(TOLDIR)/opt-case.pl 
> $(DESTDIR)$(INS_BINARY_DIR)/opt-case.pl
> --    @$(INSTALL) -m 444 $(DOCDIR)/w2r.1 
> $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/w2r.pl.$(INS_MANUAL_EXT)
> --    @$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 
> $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MANUAL_EXT)/opt-case.pl.$(INS_MANUAL_EXT)
> -+    @-if test ! -f $(DESTDIR)$(INS_DATA_DIR)/url_handler.sh ; then 
> $(INSTALL) -m 755 $(TOLDIR)/url_handler.sh 
> $(DESTDIR)$(INS_DATA_DIR)/url_handler.sh ; fi
> -+    @-if test ! -f $(DESTDIR)$(INS_DATA_DIR)/metamutt ; then $(INSTALL) -m 
> 755 $(TOLDIR)/metamutt $(DESTDIR)$(INS_DATA_DIR)/metamutt ; fi
> -+    @$(INSTALL) -m 755 $(TOLDIR)/w2r.pl $(DESTDIR)$(INS_DATA_DIR)/w2r.pl
> -+    @$(INSTALL) -m 755 $(TOLDIR)/opt-case.pl 
> $(DESTDIR)$(INS_DATA_DIR)/opt-case.pl
> -+    @$(INSTALL) -m 444 $(DOCDIR)/w2r.1 
> $(DESTDIR)$(INS_DATA_DIR)/w2r.pl.$(INS_MANUAL_EXT)
> -+    @$(INSTALL) -m 444 $(DOCDIR)/opt-case.1 
> $(DESTDIR)$(INS_DATA_DIR)/opt-case.pl.$(INS_MANUAL_EXT)
> - 
> - uninstall_helpers:
> -     @$(ECHO) "Removing helper applications ..."
> + TIN_DEP     = \
> +     Makefile \
> diff -Nurd /usr/ports/news/tin/pkg/DESCR /usr/ports/mystuff/news/tin/pkg/DESCR
> --- /usr/ports/news/tin/pkg/DESCR     Mon Dec 15 22:55:15 2003
> +++ /usr/ports/mystuff/news/tin/pkg/DESCR     Tue Jan 23 23:15:26 2007
> @@ -3,5 +3,5 @@
>  server. It will automatically utilize NOV newsoverview style index
>  files if available locally or via the NNTP [X]OVER command (RFC2980).
>  
> -Flavors:
> -     nntp_only - only read news remotely via a NNTP server.
> +When updating from 1.6.2, please note that the helper scripts are now
> +in $LOCALBASE, which is /usr/local by default.
> diff -Nurd /usr/ports/news/tin/pkg/PLIST /usr/ports/mystuff/news/tin/pkg/PLIST
> --- /usr/ports/news/tin/pkg/PLIST     Wed Sep 15 20:21:22 2004
> +++ /usr/ports/mystuff/news/tin/pkg/PLIST     Tue Jan 23 23:00:00 2007
> @@ -1,8 +1,16 @@
>  @comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:21:22 espie Exp $
> +bin/metamutt
> +bin/opt-case.pl
>  bin/rtin
>  bin/tin
> +bin/tinews.pl
> +bin/url_handler.sh
> +bin/w2r.pl
> [EMAIL PROTECTED] man/man1/opt-case.pl.1
>  @man man/man1/rtin.1
>  @man man/man1/tin.1
> [EMAIL PROTECTED] man/man1/tinews.pl.1
> [EMAIL PROTECTED] man/man1/w2r.pl.1
>  @man man/man5/tin.5
>  share/locale/de/LC_MESSAGES/tin.mo
>  share/locale/en_GB/
> @@ -10,12 +18,12 @@
>  share/locale/en_GB/LC_MESSAGES/tin.mo
>  share/locale/et/LC_MESSAGES/tin.mo
>  share/locale/fr/LC_MESSAGES/tin.mo
> +share/locale/ru/LC_MESSAGES/tin.mo
> +share/locale/rw/
> +share/locale/rw/LC_MESSAGES/
> +share/locale/rw/LC_MESSAGES/tin.mo
> +share/locale/sv/LC_MESSAGES/tin.mo
> +share/locale/tr/LC_MESSAGES/tin.mo
>  share/tin/
> -share/tin/metamutt
>  share/tin/mime.types
> -share/tin/opt-case.pl
> -share/tin/opt-case.pl.1
>  share/tin/tin.defaults
> -share/tin/url_handler.sh
> -share/tin/w2r.pl
> -share/tin/w2r.pl.1

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm

Reply via email to