I was notified by Giovanni Bechis and Ingo Schwarze that tin picks up
icu4c in 4.3-current (thanks!); in fact, this appears to have been the
case for a long time.
This patch changes the following things:
- add icu4c as a dependency (used to normalize unicode when searching
for it)
- change e-mail address ([EMAIL PROTECTED] will likely expire within
12-18 months, some time after graduation)
- change COMMENT (the previous one was unnecessarily ugly)
- change spool to /var/spool/news - this matches leafnode, which is
AFAICS the only way to get a news spool using programs in ports
- disable checking for libuu (not currently ported, but will prevent
similar mishaps in the future)
- do not try to write to /usr (configure used to do this, to test for
support for long file names; noticed by Giovanni Bechis a while ago)
I've been using this for a while on amd64, and Ingo Schwarze also
reported finding no problems (yet).
Joachim
diff -Nurd tin.org/Makefile tin/Makefile
--- tin.org/Makefile Wed Apr 30 20:14:16 2008
+++ tin/Makefile Wed Apr 30 22:28:04 2008
@@ -1,22 +1,22 @@
# $OpenBSD: Makefile,v 1.32 2007/09/15 21:41:50 merdely Exp $
-COMMENT= threaded NNTP and spool based UseNet newsreader
+COMMENT= threaded NNTP- and spool-based UseNet newsreader
-DISTNAME= tin-${VERSION}.${PATCHLEVEL}
-PKGNAME= ${DISTNAME}
-VERSION= 1.8
+DISTNAME= tin-${MAJORVERSION}.${PATCHLEVEL}
+PKGNAME= ${DISTNAME}p0
+MAJORVERSION= 1.8
PATCHLEVEL= 3
CATEGORIES= news
-MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${VERSION}/ \
-
ftp://ftp.akk.uni-karlsruhe.de/pub/news/clients/tin/v${VERSION}/ \
- ftp://ftp.cuhk.edu.hk/pub/packages/news/tin/v${VERSION}/ \
- ftp://ftp.sunet.se/pub/news/readers/tin/v${VERSION}/ \
+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= Joachim Schipper <[EMAIL PROTECTED]>
+MAINTAINER= Joachim Schipper <[EMAIL PROTECTED]>
MODULES= devel/gettext
@@ -29,7 +29,8 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c ncurses
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf no-autoheader
+AUTOCONF_VERSION= 2.13
# --with-x does not affect the build, but let's be safe.
CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell \
--without-metamail \
@@ -39,7 +40,7 @@
--with-screen=ncurses \
--with-pcre=${LOCALBASE} \
--with-libdir=${PREFIX}/lib/news \
- --with-spooldir=/var/news \
+ --with-spooldir=/var/spool/news \
--enable-break-long-lines \
--enable-ipv6 \
--without-x
@@ -48,7 +49,8 @@
LIB_DEPENDS+= pcre::devel/pcre \
utf8::misc/libutf8 \
- idn::devel/libidn
+ idn::devel/libidn \
+ icuuc::textproc/icu4c
ALL_TARGET= build
diff -Nurd tin.org/patches/patch-configure_in tin/patches/patch-configure_in
--- tin.org/patches/patch-configure_in Wed Dec 31 18:00:00 1969
+++ tin/patches/patch-configure_in Sat May 3 14:07:20 2008
@@ -0,0 +1,48 @@
+$OpenBSD$
+--- configure.in.orig Thu Feb 1 07:11:14 2007
++++ configure.in Sat May 3 14:07:13 2008
+@@ -34,7 +34,7 @@ dnl SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SU
+ dnl
+ dnl Process this file with autoconf to produce a configure script.
+
+-AC_PREREQ(2.13.20020210)
++AC_PREREQ(2.13)
+ AC_INIT(include/tin.h)
+ AC_CONFIG_HEADER(include/autoconf.h:include/autoconf.hin)
+ AC_PREFIX_DEFAULT(/usr/local)
+@@ -805,13 +805,15 @@ fi
+ ### Checks for libraries.
+ # libuu/uudeview
+ # only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found
+-AC_CHECK_LIB(uu, UUInitialize,
+- [AC_CHECK_HEADER(uudeview.h,
+- [AC_DEFINE(HAVE_LIBUU)
+- AC_DEFINE(HAVE_UUDEVIEW_H)
+- LIBS="$LIBS -luu"]
+- )]
+-)
++dnl Disable to make sure the package does not change if someone ever ports
this
++dnl
++dnl AC_CHECK_LIB(uu, UUInitialize,
++dnl [AC_CHECK_HEADER(uudeview.h,
++dnl [AC_DEFINE(HAVE_LIBUU)
++dnl AC_DEFINE(HAVE_UUDEVIEW_H)
++dnl LIBS="$LIBS -luu"]
++dnl )]
++dnl )
+
+ # libidn - Internationalized Domain Names
+ AC_CHECK_LIB(idn, stringprep_check_version,
+@@ -1018,7 +1020,11 @@ CF_TERMIOS
+ CF_PW_GECOS
+ CF_TM_GMTOFF
+
+-AC_SYS_LONG_FILE_NAMES
++dnl AC_SYS_LONG_FILE_NAMES tries to write to /usr and thus fails if /usr is
++dnl mounted read-only. Since OpenBSD always supports long filenames, set the
++dnl flag unconditionally.
++dnl AC_SYS_LONG_FILE_NAMES
++AC_DEFINE(HAVE_LONG_FILE_NAMES)
+ CF_FUNC_SYSTEM
+
+ # Check if we are trying to use curses+color, but cannot
diff -Nurd tin.org/patches/patch-src_Makefile_in
tin/patches/patch-src_Makefile_in
--- tin.org/patches/patch-src_Makefile_in Wed Apr 30 20:14:16 2008
+++ tin/patches/patch-src_Makefile_in Wed Apr 30 21:11:53 2008
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2007/03/21 17:28:50 naddy Exp $
---- src/Makefile.in.orig Thu May 4 10:19:04 2006
-+++ src/Makefile.in Sun Mar 18 22:54:49 2007
-@@ -78,6 +78,7 @@ LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS
+--- src/Makefile.in.orig Thu May 4 03:19:04 2006
++++ src/Makefile.in Wed Apr 30 20:24:39 2008
+@@ -78,6 +78,7 @@ LINK_LIBS = $(PCRE_LIBS) $(CANLIB) @LIBS@ @INN_NNTPLIB
# Where do you want the binary & manual page installed?
DESTDIR = @DESTDIR@
INS_BINARY_DIR = @bindir@
@@ -17,7 +17,7 @@
$(DESTDIR)$(INS_SYSDEF_DIR) :
$(top_srcdir)/mkdirs.sh $@
-@@ -336,8 +338,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL
+@@ -336,8 +338,6 @@ install_manpage : $(DESTDIR)$(INS_MANUAL_DIR)$(INS_MAN
@$(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
