+ Turn BUILDNAME into a table so it's easier to read.

+ Drop dependency on ncurses added in revision 1.38 of Makefile.  In
  the PR cited (PR pkg/21887), the patch included in the PR only added
  a dependency on ncurses on Linux which I suspect is related to not
  having a termcap library on Linux.  The commit incorrectly turned
  that conditional dependency into an unconditional one.

  We now include termcap.buildlink3.mk to note that this package needs
  the termcap t*() routines.

  Bump the PKGREVISION to 2.

3 files changed, 30 insertions, 31 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index a3db611764a..4477922b786 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2008/03/03 18:25:53 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2008/03/04 22:00:30 jlam Exp $
 #
 # NOTE:
 # When updating, it is necessary to change the shlib version, located in
@@ -8,7 +8,7 @@
 
 DISTNAME=	pine4.64
 PKGNAME=	pico-4.10
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -26,37 +26,38 @@ USE_LIBTOOL=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-BUILDNAME=	osx
-LIBS+=		-lcurses
-.elif ${OPSYS} == "IRIX"
+OPSYSVARS+=		BUILDNAME
+BUILDNAME.Darwin=	osx
+.if ${OPSYS} == "IRIX"
 .  if ${OS_VERSION} >= 6.5
-BUILDNAME=	sg6
+BUILDNAME.IRIX=		sg6
 .  else
-BUILDNAME=	sgi
+BUILDNAME.IRIX=		sgi
 .  endif
-.elif ${OPSYS} == "Interix"
-BUILDNAME=	sfu
-.elif ${OPSYS} == "Linux"
-BUILDNAME=	lnx
-.elif ${OPSYS} == "SunOS"
-BUILDNAME=	so5
-.else
-BUILDNAME=	neb
 .endif
+BUILDNAME.Interix=	sfu
+BUILDNAME.Linux=	lnx
+BUILDNAME.SunOS=	so5
+BUILDNAME.NetBSD=	neb
+BUILDNAME.*=		neb
+
+# Let termcap.buildlink3.mk handle using the right termcap library.
+SUBST_CLASSES+=		tcap
+SUBST_STAGE.tcap=	pre-configure
+SUBST_FILES.tcap=	pico/makefile.*
+SUBST_SED.tcap=		-e "s/-lncurses//"
+LIBS+=			${BUILDLINK_LDADD.termcap}
 
 MAKE_ENV+=	_STRIPFLAG_INSTALL=	# debug...
 
 INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man1
 
-pre-patch:
-.if ${OPSYS} == "Interix"
-	${CP} -f \
-		${WRKSRC}/pico/osdep/os-sol.h ${WRKSRC}/pico/osdep/os-sfu.h
+# Create the OS-dependent files for Interix from the Solaris ones.
+post-extract:
+	${CP} -f ${WRKSRC}/pico/osdep/os-sol.h ${WRKSRC}/pico/osdep/os-sfu.h
 	${SED} -e 's,read.pol,read.sel,' \
 		${WRKSRC}/pico/osdep/os-sv4.ic >${WRKSRC}/pico/osdep/os-sfu.ic
-.endif
-	${SED} -e 's,-ltermlib,-lcurses,g;s,sv4,sfu,g' \
+	${SED} -e 's,sv4,sfu,g' \
 		${WRKSRC}/pico/makefile.sv4 >${WRKSRC}/pico/makefile.sfu
 
 do-build:
@@ -75,5 +76,5 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/pico
 	cd ${WRKSRC}/pico && ${INSTALL_DATA} *.h ${DESTDIR}${PREFIX}/include/pico
 
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/pico/distinfo b/editors/pico/distinfo
index 4ecb6c4a368..611f5b7cfd7 100644
--- a/editors/pico/distinfo
+++ b/editors/pico/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2006/01/12 21:00:52 adam Exp $
+$NetBSD: distinfo,v 1.24 2008/03/04 22:00:30 jlam Exp $
 
 SHA1 (pine4.64.tar.bz2) = b88aeb64ec2fa30bbb38fda3a051d98dc0e19c5e
 RMD160 (pine4.64.tar.bz2) = 8661cd3c0875e46c8cd5eafa7c7c964f79a3b3fd
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = cda803b835c5d0d7cb4e4c3f162a680db2b8a0b1
 SHA1 (patch-ac) = a6de88e9ab5f1464d58476cbbeb0579938d51427
 SHA1 (patch-ad) = a5145664372b0ad308a0ee2501211e927d343971
 SHA1 (patch-ae) = 143fa40c6c597c23fc7ac187c683cbff7bf85688
-SHA1 (patch-af) = 430922a5388d6924461445af9701f75c0fcf3922
+SHA1 (patch-af) = 82bc822744e6a74d0bd86bafb1654d0fac0a8b81
 SHA1 (patch-ag) = e92dbb0cacb7104570c356f093ad2fb1cd3b9d2d
 SHA1 (patch-ah) = 65f713181af150c64a28ec6547fc966eddae1961
 SHA1 (patch-ai) = 7e2a70ee4322aa85de80089c2e4470ec12bfe110
diff --git a/editors/pico/patches/patch-af b/editors/pico/patches/patch-af
index ec2228cb436..5a5866b4310 100644
--- a/editors/pico/patches/patch-af
+++ b/editors/pico/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2006/01/12 21:00:52 adam Exp $
+$NetBSD: patch-af,v 1.7 2008/03/04 22:00:30 jlam Exp $
 
---- pico/makefile.osx.orig	Fri Sep 20 14:23:15 2002
+--- pico/makefile.osx.orig	2002-09-20 14:23:11.000000000 -0400
 +++ pico/makefile.osx
-@@ -38,11 +38,7 @@ STDCFLAGS=	-Dbsd -DJOB_CONTROL
+@@ -38,10 +38,6 @@ STDCFLAGS=	-Dbsd -DJOB_CONTROL
  CFLAGS=         $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
  
  # switches for library building
@@ -10,11 +10,9 @@ $NetBSD: patch-af,v 1.6 2006/01/12 21:00:52 adam Exp $
 -LIBARGS=	ru
 -RANLIB=		ranlib
 -
--LIBS=		$(EXTRALDFLAGS) -lncurses
-+LIBS=		$(EXTRALDFLAGS)
+ LIBS=		$(EXTRALDFLAGS) -lncurses
  
  OFILES=		attach.o basic.o bind.o browse.o buffer.o \
- 		composer.o display.o file.o fileio.o line.o pico_os.o \
 @@ -55,17 +51,17 @@ HFILES=		headers.h estruct.h edef.h efun
  # dependencies for the Unix versions of pico and libpico.a
  #