From 89c79805521bafc92ad70261b1a115b47737d317 Mon Sep 17 00:00:00 2001
From: ache <ache@FreeBSD.org>
Date: Thu, 11 Feb 1999 11:13:54 +0000
Subject: fix configure mistakes use uulib

---
 news/tin/Makefile       | 17 +++++++++++++----
 news/tin/files/patch-ab | 19 +++++++++++++++++++
 news/tin/pkg-plist      |  1 +
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 news/tin/files/patch-ab

(limited to 'news')

diff --git a/news/tin/Makefile b/news/tin/Makefile
index e6f4a036dce0..1a14bed1b4b1 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -4,7 +4,7 @@
 # Date created:		25 July 1996
 # Whom:			obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.63 1998/10/14 04:06:31 jseger Exp $
+# $Id: Makefile,v 1.64 1998/10/15 00:07:04 jseger Exp $
 #
 
 DISTNAME=       tinpre-1.4-980818
@@ -14,6 +14,8 @@ MASTER_SITES=   ftp://ftp.tin.org/pub/news/clients/tin/current/ \
 		ftp://ftp.nuxi.com/pub/tin/
 EXTRACT_SUFX=	.tgz
 
+LIB_DEPENDS=    uu.1:${PORTSDIR}/converters/uulib
+
 MAINTAINER=     ache@FreeBSD.org
 
 WRKSRC=         ${WRKDIR}/${DISTNAME:S/pre-1.4//}
@@ -27,12 +29,17 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=  --with-nntp-default-server=news  \
 		 --with-spooldir=/var/news  \
 		 --with-libdir=${PREFIX}/news/lib \
+		 --with-defaults-dir=${PREFIX}/etc \
+		 --with-editor=/usr/bin/ee \
 		 --with-mime-default-charset=ISO-8859-1 \
 		 --enable-forgery \
 		 --enable-break-long-lines \
 		 --with-pgp=${PREFIX}/bin/pgp \
 		 --with-ispell=${PREFIX}/bin/ispell \
 		 --with-metamail=${PREFIX}/bin/metamail
+CONFIGURE_ENV=  CFLAGS='${CFLAGS} -I${PREFIX}/include -DNNTP_SERVER_FILE="\"${PREFIX}/etc/nntpserver\""' \
+		CPPFLAGS='${CPPFLAGS} -I${PREFIX}/include' \
+		LDFLAGS='${LDFLAGS} -L${PREFIX}/lib'
 MAKEFILE=       makefile
 ALL_TARGET=     build
 MAN1=		tin.1
@@ -48,8 +55,10 @@ post-patch:
 		-e 's:/usr/lib/news:${PREFIX}/news/lib:' \
 		<${WRKSRC}/doc/tin.1.dist >${WRKSRC}/doc/tin.1
 
-post-configure:
-	${ECHO} '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntpserver"' >>${WRKSRC}/include/autoconf.h
-	${ECHO} '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
+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
 
 .include <bsd.port.mk>
diff --git a/news/tin/files/patch-ab b/news/tin/files/patch-ab
new file mode 100644
index 000000000000..79afa15ef3f6
--- /dev/null
+++ b/news/tin/files/patch-ab
@@ -0,0 +1,19 @@
+--- configure.bak	Fri Aug  7 23:28:32 1998
++++ configure	Thu Feb 11 11:37:53 1999
+@@ -5963,6 +5963,7 @@
+ 	if test $found_tcap != yes ; then
+ 		case $host_os in #(vi
+ 		freebsd*)
++if test "${with_ncurses+set}" = set; then
+ 			# This is only necessary if you are linking against an
+ 			# obsolete version of ncurses (but it should do no
+ 			# harm, since it's static).
+@@ -6005,7 +6006,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
++		fi
+ 			;;
+ 		esac
+ 	fi
diff --git a/news/tin/pkg-plist b/news/tin/pkg-plist
index 29d471af4cab..6039e07fdb2d 100644
--- a/news/tin/pkg-plist
+++ b/news/tin/pkg-plist
@@ -1,3 +1,4 @@
 bin/tin
 @exec ln -fs %f %B/rtin
 @unexec rm -f %B/rtin
+etc/tin.defaults.dist
-- 
cgit