[Midnightbsd-cvs] mports [21550] trunk/news/tin: tin 2.3.2

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 5 21:45:50 EDT 2016 

Revision: 21550
          http://svnweb.midnightbsd.org/mports/?rev=21550
Author:   laffer1
Date:     2016-08-05 21:45:47 -0400 (Fri, 05 Aug 2016)
Log Message:
-----------
tin 2.3.2

Modified Paths:
--------------
    trunk/news/tin/Makefile
    trunk/news/tin/distinfo
    trunk/news/tin/pkg-plist

Added Paths:
-----------
    trunk/news/tin/files/patch-configure
    trunk/news/tin/files/patch-include_autoconf.hin

Removed Paths:
-------------
    trunk/news/tin/files/patch-ab
    trunk/news/tin/files/patch-ae

Modified: trunk/news/tin/Makefile
===================================================================
--- trunk/news/tin/Makefile	2016-08-06 01:43:06 UTC (rev 21549)
+++ trunk/news/tin/Makefile	2016-08-06 01:45:47 UTC (rev 21550)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	tin
-PORTVERSION=	2.0.1
-PORTREVISION?=	4
+PORTVERSION=	2.3.2
 CATEGORIES+=	news ipv6
 MASTER_SITES=	ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
 		ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
@@ -21,25 +20,35 @@
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
 LICENSE=	bsd3
 
-LIB_DEPENDS=	uu:${PORTSDIR}/converters/uulib \
-		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libuu.so:${PORTSDIR}/converters/uulib \
+		libpcre.so:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
-USE_BZIP2=	yes
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		gmake iconv ncurses shebangfix tar:bzip2
 GNU_CONFIGURE=	yes
+SHEBANG_FILES=	tools/opt-case.pl tools/tinews.pl tools/url_handler.pl \
+		tools/w2r.pl
 TIN_EDITOR?=	/usr/bin/ee
 TIN_SCREEN?=	ncursesw
 
-OPTIONS_DEFINE=	GNUPG METAMAIL CANLOCK NNTP_ONLY
-OPTIONS_DEFAULT=GNUPG METAMAIL
-CANLOCK_DESC=	Enable Cancel-Lock key support via libcanlock
-NNTP_ONLY=	Only read news via NNTP (no spool dir support)
+OPTIONS_DEFINE=		GNUPG ISPELL METAMAIL CANLOCK NNTP_ONLY NLS
+OPTIONS_DEFAULT=	GNUPG ISPELL METAMAIL
+OPTIONS_SUB=		yes
+NNTP_ONLY_DESC=		Only read news via NNTP (no spool dir support)
+NNTP_ONLY_CONFIGURE_ENABLE=nntp-only
+GNUPG_RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+GNUPG_CONFIGURE_ON=	--with-gpg=${PREFIX}/bin/gpg \
+			--without-pgp --without-pgpk
+GNUPG_CONFIGURE_OFF=	--disable-pgp-gpg
+ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_CONFIGURE_ARGS=	--with-ispell=${PREFIX}/bin/ispell
+METAMAIL_RUN_DEPENDS=	metamail:${PORTSDIR}/mail/metamail
+METAMAIL_CONFIGURE_ARGS=--with-metamail=${PREFIX}/bin/metamail
+CANLOCK_DESC=		Enable Cancel-Lock key support via libcanlock
+CANLOCK_CONFIGURE_ENABLE=cancel-locks
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
 
-.include <bsd.mport.options.mk>
-
 # --with-mime-default-charset=US-ASCII needed to build tin in the non-ascii
 # national environment.
 CONFIGURE_ARGS+=--with-nntp-default-server=news \
@@ -50,48 +59,17 @@
 		--with-pcre=yes \
 		--with-screen=${TIN_SCREEN} \
 		--enable-break-long-lines \
-		--with-libiconv-prefix=${LOCALBASE} \
+		${ICONV_CONFIGURE_ARG} \
 		--with-mime-default-charset=US-ASCII \
 		--enable-ipv6
-MAKE_ARGS+=	MAKE=${GMAKE}
+MAKE_ARGS+=	MAKE=${MAKE_CMD}
 CFLAGS+=	-DNNTP_SERVER_FILE=\\\"${PREFIX}/etc/nntpserver\\\"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 ALL_TARGET=	build
-MAN1=		tin.1 w2r.pl.1 opt-case.pl.1 tinews.pl.1 tinurl_handler.pl.1
-MAN5=		tin.5 tin_mbox.5 tin_mmdf.5
-MLINKS=		tin.1 rtin.1
 
-.if ${PORT_OPTIONS:MNNTP_ONLY}
-CONFIGURE_ARGS+=	--enable-nntp-only
-.endif
+.include <bsd.mport.options.mk>
 
-.if ${PORT_OPTIONS:MGNUPG}
-RUN_DEPENDS+=		gpg:${PORTSDIR}/security/gnupg
-CONFIGURE_ARGS+=	--with-gpg=${PREFIX}/bin/gpg \
-		 	--without-pgp --without-pgpk
-.else
-CONFIGURE_ARGS+=	--disable-pgp-gpg
-.endif
-
-.if ${PORT_OPTIONS:MMETAMAIL}
-RUN_DEPENDS+=		metamail:${PORTSDIR}/mail/metamail
-CONFIGURE_ARGS+=	--with-metamail=${PREFIX}/bin/metamail
-.endif
-
-.if ${PORT_OPTIONS:MCANLOCK}
-CONFIGURE_ARGS+=	--enable-cancel-locks
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-CONFIGURE_ARGS+=	--enable-nls
-USES+=		gettext
-PLIST_SUB+=		NLS=""
-.else
-CONFIGURE_ARGS+=	--disable-nls
-PLIST_SUB+=		NLS="@comment "
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -Ee 's:5/(mmdf|mbox):5/tin_\1:g' \
 		${WRKSRC}/src/Makefile.in
@@ -110,15 +88,14 @@
 	${MV}   ${WRKSRC}/tools/url_handler.pl \
 		${WRKSRC}/tools/tinurl_handler.pl
 
+.if ${PORT_OPTIONS:MNLS}
 post-build:
-.if ${PORT_OPTIONS:MNLS}
-	cd ${WRKSRC}/po; ${GMAKE}
+	${MAKE_CMD} -C ${WRKSRC}/po
 .endif
 
 post-install:
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} tin.defaults ${PREFIX}/etc/tin.defaults.dist
-	if [ ! -f ${PREFIX}/etc/tin.defaults ] ; then \
-		${CP} ${PREFIX}/etc/tin.defaults.dist ${PREFIX}/etc/tin.defaults; \
-	fi
+	${INSTALL_DATA} ${WRKSRC}/doc/tin.defaults \
+		${STAGEDIR}${PREFIX}/etc/tin.defaults.sample
+	ln -sf tin ${STAGEDIR}${PREFIX}/bin/rtin
 
 .include <bsd.port.mk>

Modified: trunk/news/tin/distinfo
===================================================================
--- trunk/news/tin/distinfo	2016-08-06 01:43:06 UTC (rev 21549)
+++ trunk/news/tin/distinfo	2016-08-06 01:45:47 UTC (rev 21550)
@@ -1,2 +1,2 @@
-SHA256 (tin-2.0.1.tar.bz2) = eb4c1e46defb66f02eb64daa0929414c6363d9d4d74ec2458cfc6e781de89b1f
-SIZE (tin-2.0.1.tar.bz2) = 1758848
+SHA256 (tin-2.3.2.tar.bz2) = 926fa80faf55aaa002f0f4a1cee1aed825236900094ccfdd43c30cf1a129c357
+SIZE (tin-2.3.2.tar.bz2) = 1939146

Deleted: trunk/news/tin/files/patch-ab
===================================================================
--- trunk/news/tin/files/patch-ab	2016-08-06 01:43:06 UTC (rev 21549)
+++ trunk/news/tin/files/patch-ab	2016-08-06 01:45:47 UTC (rev 21550)
@@ -1,29 +0,0 @@
---- configure.orig	2010-11-26 16:07:59.000000000 +0100
-+++ configure	2011-07-09 14:33:08.000000000 +0200
-@@ -7738,7 +7738,7 @@ fi
- 
- 
- case $host_os in #(vi
--freebsd*)
-+XXXfreebsd*)
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
-@@ -8985,7 +8985,7 @@ fi
- 
- 
- case $host_os in #(vi
--freebsd*)
-+XXXfreebsd*)
- 	# This is only necessary if you are linking against an obsolete
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
-@@ -9666,7 +9666,7 @@ echo "$ac_t""$cf_result" 1>&6
- 
- if test "$cf_result" = no ; then
- case $host_os in #(vi
--freebsd*) #(vi
-+XXXfreebsd*) #(vi
-     echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
- echo "configure:9672: checking for tgoto in -lmytinfo" >&5
- ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`

Deleted: trunk/news/tin/files/patch-ae
===================================================================
--- trunk/news/tin/files/patch-ae	2016-08-06 01:43:06 UTC (rev 21549)
+++ trunk/news/tin/files/patch-ae	2016-08-06 01:45:47 UTC (rev 21550)
@@ -1,10 +0,0 @@
---- include/autoconf.hin.bak	Wed Jan 10 03:58:27 2001
-+++ include/autoconf.hin	Sat Apr 14 02:02:10 2001
-@@ -49,7 +49,6 @@
- 
- /* compiler, compilerflags, ... */
- #	undef TIN_CC
--#	undef TIN_CFLAGS
- #	undef TIN_CPP
- #	undef TIN_CPPFLAGS
- #	undef TIN_LD

Added: trunk/news/tin/files/patch-configure
===================================================================
--- trunk/news/tin/files/patch-configure	                        (rev 0)
+++ trunk/news/tin/files/patch-configure	2016-08-06 01:45:47 UTC (rev 21550)
@@ -0,0 +1,29 @@
+--- configure.orig	2015-12-24 08:48:36.000000000 +0100
++++ configure	2016-01-16 18:09:27.783380000 +0100
+@@ -9167,7 +9167,7 @@ fi
+ 
+ 
+ case $host_os in
+-(freebsd*)
++(XXXfreebsd*)
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+@@ -10649,7 +10649,7 @@ fi
+ 
+ 
+ case $host_os in
+-(freebsd*)
++(XXXfreebsd*)
+ 	# This is only necessary if you are linking against an obsolete
+ 	# version of ncurses (but it should do no harm, since it's static).
+ 	if test "$cf_nculib_root" = ncurses ; then
+@@ -11329,7 +11329,7 @@ echo "$ac_t""$cf_result" 1>&6
+ 
+ if test "$cf_result" = no ; then
+ case $host_os in
+-(freebsd*)
++(XXXfreebsd*)
+ 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
+ echo "configure:11335: checking for tgoto in -lmytinfo" >&5
+ ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`


Property changes on: trunk/news/tin/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/news/tin/files/patch-include_autoconf.hin
===================================================================
--- trunk/news/tin/files/patch-include_autoconf.hin	                        (rev 0)
+++ trunk/news/tin/files/patch-include_autoconf.hin	2016-08-06 01:45:47 UTC (rev 21550)
@@ -0,0 +1,10 @@
+--- include/autoconf.hin.orig	2015-11-22 01:15:52.000000000 +0100
++++ include/autoconf.hin	2016-01-16 18:09:27.785884000 +0100
+@@ -46,7 +46,6 @@
+ 
+ /* compiler, compilerflags, ... */
+ #	undef TIN_CC
+-#	undef TIN_CFLAGS
+ #	undef TIN_CPP
+ #	undef TIN_CPPFLAGS
+ #	undef TIN_LD


Property changes on: trunk/news/tin/files/patch-include_autoconf.hin
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/news/tin/pkg-plist
===================================================================
--- trunk/news/tin/pkg-plist	2016-08-06 01:43:06 UTC (rev 21549)
+++ trunk/news/tin/pkg-plist	2016-08-06 01:45:47 UTC (rev 21550)
@@ -1,14 +1,20 @@
 bin/metamutt
 bin/opt-case.pl
+bin/rtin
 bin/tin
- at exec ln -fs %f %B/rtin
- at unexec rm -f %B/rtin
 bin/tinews.pl
 bin/tinurl_handler.pl
 bin/w2r.pl
- at unexec if cmp -s %D/etc/tin.defaults %D/etc/tin.defaults.dist; then rm -f %D/etc/tin.defaults; fi
-etc/tin.defaults.dist
- at exec [ -f %B/tin.defaults ] || cp %B/%f %B/tin.defaults
+ at sample etc/tin.defaults.sample
+man/man1/opt-case.pl.1.gz
+man/man1/rtin.1.gz
+man/man1/tin.1.gz
+man/man1/tinews.pl.1.gz
+man/man1/tinurl_handler.pl.1.gz
+man/man1/w2r.pl.1.gz
+man/man5/tin.5.gz
+man/man5/tin_mbox.5.gz
+man/man5/tin_mmdf.5.gz
 %%NLS%%share/locale/da/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/de/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/tin.mo
@@ -17,3 +23,5 @@
 %%NLS%%share/locale/ru/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/tin.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/tin.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/tin.mo

More information about the Midnightbsd-cvs mailing list