update to 0.9.9p1 for new slang.

This commit is contained in:
sthen 2009-10-13 21:49:02 +00:00
parent d54ce5bc2e
commit 5d549e77ca
6 changed files with 100 additions and 89 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.43 2007/09/15 21:41:50 merdely Exp $
# $OpenBSD: Makefile,v 1.44 2009/10/13 21:49:02 sthen Exp $
COMMENT= SLang-based newsreader
VERSION= 0.9.8.1
DISTNAME= slrn-${VERSION}
PKGNAME= ${DISTNAME}p2
DISTNAME= slrn-0.9.9p1 # p1 is part of upstream version XXX
PKGNAME= ${DISTNAME:S/p/pl/}
CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slrn/}
@ -15,26 +14,30 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto m ssl termcap
FAKE= lib
PFILES= lastchar fetch
MASTER_SITES0= http://slrn.sourceforge.net/patches/
.for i in ${PFILES}
PATCHFILES+= slrn-${VERSION}-$i.diff:0
.endfor
PATCH_DIST_STRIP=-p1
#FAKE= lib
##PFILES= lastchar fetch
##MASTER_SITES0= http://slrn.sourceforge.net/patches/
##.for i in ${PFILES}
##PATCHFILES+= slrn-${VERSION}-$i.diff:0
##.endfor
##PATCH_DIST_STRIP=-p1
MAKE_ARGS+= SLRN_SENDMAIL_COMMAND="/usr/sbin/sendmail -oi -t -oem -odb" \
LDFLAGS="${LDFLAGS}"
NO_REGRESS= Yes
LIB_DEPENDS= slang.::devel/libslang
LIB_DEPENDS= slang.>=15::devel/libslang
MODULES= devel/gettext
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-inews --with-ssl --with-slrnpull --enable-spool
CONFIGURE_ARGS+= --with-slang-library=${DEPBASE}/lib \
--with-slang-includes=${DEPBASE}/include \
--with-libiconv-prefix=${DEPBASE} \
--with-libintl-prefix=${DEPBASE}
LDFLAGS= -L${LOCALBASE}/lib -lm
CONFIGURE_ENV= LDFLAGS="${LDFLAGS}"
#CPPFLAGS="-I ${LOCALBASE}/include"
CONFIGURE_ARGS+= --with-slang=${LOCALBASE} \
--with-libiconv=${LOCALBASE}
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autoconf

View File

@ -1,15 +1,5 @@
MD5 (slrn-0.9.8.1-fetch.diff) = lpRxaFqnQSvGCGlkkxJhjw==
MD5 (slrn-0.9.8.1-lastchar.diff) = e8xbQT20tbmqsiZiIxFnrw==
MD5 (slrn-0.9.8.1.tar.gz) = bQ2aEOrpW6kCKUwC5D6g0Q==
RMD160 (slrn-0.9.8.1-fetch.diff) = 52cXj5Q/k01hvDu0kYnVhW9U5q8=
RMD160 (slrn-0.9.8.1-lastchar.diff) = iQbwSbpyJdQ9vbOk0Vx87moQcKU=
RMD160 (slrn-0.9.8.1.tar.gz) = CQiC2HmqsNIGwOFoRF0j8Ybrr+k=
SHA1 (slrn-0.9.8.1-fetch.diff) = VZEzLOKMMIOuZIULbU83HDz3d3M=
SHA1 (slrn-0.9.8.1-lastchar.diff) = 75nzlX+fu6DDB98EkOqERXUILY8=
SHA1 (slrn-0.9.8.1.tar.gz) = FQLev1JLkOzrKxUgKm080PXcaIc=
SHA256 (slrn-0.9.8.1-fetch.diff) = CuIoB18Vl38NBjzWDvib48mEaS7tdep6o+uzu1nX4kM=
SHA256 (slrn-0.9.8.1-lastchar.diff) = S+mQPyKogLVoaaFtJqT+7fRxJbfbYx4OxvG5dvnJv5k=
SHA256 (slrn-0.9.8.1.tar.gz) = Y7drVimkUE8pTWtXNT/+YLzG83+6rrD3sbmG4BhL6ik=
SIZE (slrn-0.9.8.1-fetch.diff) = 920
SIZE (slrn-0.9.8.1-lastchar.diff) = 4411
SIZE (slrn-0.9.8.1.tar.gz) = 1510596
MD5 (slrn-0.9.9p1.tar.gz) = bMisa6r/fMKot49/u+MYfw==
RMD160 (slrn-0.9.9p1.tar.gz) = nmFNEsMPcqTM3pD+VXSV2G1Es2g=
SHA1 (slrn-0.9.9p1.tar.gz) = 8U2I7aObeL0vCY8hHUocNjwP6SQ=
SHA256 (slrn-0.9.9p1.tar.gz) = OolvQreMMiUoeP0pGyHWSC1GaSG2irl/fYy630p2tTM=
SIZE (slrn-0.9.9p1.tar.gz) = 1535032

View File

@ -1,16 +1,57 @@
$OpenBSD: patch-configure,v 1.1 2005/04/19 12:53:21 alek Exp $
--- configure.orig Tue Apr 19 14:13:16 2005
+++ configure Tue Apr 19 14:13:22 2005
@@ -9736,10 +9736,10 @@ s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
s,@USE_NLS@,$USE_NLS,;t t
-s,@LIBICONV@,$LIBICONV,;t t
+s,@LIBICONV@,$LTLIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
+s,@LIBINTL@,$LTLIBINTL,;t t
s,@LTLIBINTL@,$LTLIBINTL,;t t
s,@POSUB@,$POSUB,;t t
s,@TERMCAP@,$TERMCAP,;t t
$OpenBSD: patch-configure,v 1.2 2009/10/13 21:49:02 sthen Exp $
--- configure.orig Tue Aug 26 17:21:08 2008
+++ configure Sat Oct 10 20:33:28 2009
@@ -14216,7 +14216,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
CANLOCK_INC!$CANLOCK_INC$ac_delim
LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
_ACEOF
@@ -14270,7 +14270,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
INCICONV!$INCICONV$ac_delim
@@ -15574,7 +15574,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
CANLOCK_INC!$CANLOCK_INC$ac_delim
LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
_ACEOF
@@ -15628,7 +15628,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
INCICONV!$INCICONV$ac_delim
@@ -16933,7 +16933,7 @@ CANLOCK_LIB!$CANLOCK_LIB$ac_delim
CANLOCK_INC!$CANLOCK_INC$ac_delim
LINK_LIBCANLOCK!$LINK_LIBCANLOCK$ac_delim
SLRN_HAS_CANLOCK!$SLRN_HAS_CANLOCK$ac_delim
-LIBICONV!$LIBICONV$ac_delim
+LIBICONV!$LTLIBICONV$ac_delim
LTLIBICONV!$LTLIBICONV$ac_delim
_ACEOF
@@ -16987,7 +16987,7 @@ XGETTEXT_015!$XGETTEXT_015$ac_delim
MSGMERGE!$MSGMERGE$ac_delim
INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
+LIBINTL!$LTLIBINTL$ac_delim
LTLIBINTL!$LTLIBINTL$ac_delim
POSUB!$POSUB$ac_delim
INCICONV!$INCICONV$ac_delim

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2005/04/19 12:53:21 alek Exp $
--- src/Makefile.in.orig Tue Apr 19 14:20:10 2005
+++ src/Makefile.in Tue Apr 19 14:20:20 2005
@@ -238,7 +238,7 @@ slrnpull_SOURCES = nntplib.c slrndir.c s
ranges.c vfile.c
slrnpull_DEPENDENCIES = stamp2
-INCLUDES = -I. -I$(top_srcdir)/intl @SLANG_INC@ @SSLINC@ @UUINC@ @LOCKINC@
+INCLUDES = -I. @SLANG_INC@ @SSLINC@ @UUINC@ @LOCKINC@
LDADD = @LIBINTL@ @SLANG_LIB@ -lslang @TERMCAP@ @SSLLIB@ @UULIB@ @LOCKLIB@
uudecode_SOURCES = slrndir.c snprintf.c ttymsg.c util.c
uudecode_LDADD = uudecode.o @LIBINTL@ @SLANG_LIB@ -lslang

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_slrnfeat_h,v 1.1 2001/04/10 14:59:16 lebel Exp $
--- src/slrnfeat.h.orig Tue Apr 10 10:19:53 2001
+++ src/slrnfeat.h Tue Apr 10 10:22:10 2001
@@ -150,7 +150,7 @@
# define SLRN_FOLLOWUP_FILENAME ".followup"
# define SLRN_SIGNATURE_FILE ".signature"
# ifndef SLRN_SENDMAIL_COMMAND
-# define SLRN_SENDMAIL_COMMAND "/usr/lib/sendmail -oi -t -oem -odb"
+# define SLRN_SENDMAIL_COMMAND "/usr/sbin/sendmail -oi -t -oem -odb"
# endif
# ifndef SLRN_LIB_DIR
# define SLRN_LIB_DIR "/usr/local/lib/slrn"

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.14 2007/05/25 00:50:50 aanriot Exp $
bin/slrn
bin/slrnpull
@comment $OpenBSD: PLIST,v 1.15 2009/10/13 21:49:02 sthen Exp $
@bin bin/slrn
@bin bin/slrnpull
@man man/man1/slrn.1
@man man/man1/slrnpull.1
share/doc/slrn/
@ -45,18 +45,19 @@ share/locale/ru/LC_MESSAGES/slrn.mo
share/locale/sv/LC_MESSAGES/slrn.mo
share/locale/tr/LC_MESSAGES/slrn.mo
share/slrn/
share/slrn/macros/
share/slrn/macros/color.sl
share/slrn/macros/gsort.sl
share/slrn/macros/ispell.sl
share/slrn/macros/latin2.sl
share/slrn/macros/multipart.sl
share/slrn/macros/nn.sl
share/slrn/macros/posthook.sl
share/slrn/macros/search.sl
share/slrn/macros/tin-art.sl
share/slrn/macros/tin-group.sl
share/slrn/macros/ttyprint.sl
share/slrn/macros/util.sl
share/slrn/macros/varset.sl
share/slrn/macros/xcomment.sl
share/slrn/slang/
share/slrn/slang/color.sl
share/slrn/slang/gsort.sl
share/slrn/slang/ispell.sl
share/slrn/slang/latin2.sl
share/slrn/slang/multipart.sl
share/slrn/slang/nn.sl
share/slrn/slang/posthook.sl
share/slrn/slang/search.sl
share/slrn/slang/slrn.sl
share/slrn/slang/tin-art.sl
share/slrn/slang/tin-group.sl
share/slrn/slang/ttyprint.sl
share/slrn/slang/util.sl
share/slrn/slang/varset.sl
share/slrn/slang/xcomment.sl