Sun Mar 2 07:08:39 2008 UTC ()
Remove unnecessary hack to force the configure script to use only our
termcap library -- revision 1.2 of termcap.buildlink3.mk already fixes
this issue.


(jlam)
diff -r1.61 -r1.62 pkgsrc/shells/tcsh/Makefile
cvs diff -r1.61 -r1.62 pkgsrc/shells/tcsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/tcsh/Makefile 2008/02/29 22:42:02 1.61
+++ pkgsrc/shells/tcsh/Makefile 2008/03/02 07:08:39 1.62
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.61 2008/02/29 22:42:02 jlam Exp $ 1# $NetBSD: Makefile,v 1.62 2008/03/02 07:08:39 jlam Exp $
2# 2#
3 3
4DISTNAME= tcsh-6.15.00 4DISTNAME= tcsh-6.15.00
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= shells 6CATEGORIES= shells
7MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \ 7MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ \
8 ftp://ftp.gw.com/pub/unix/tcsh/ \ 8 ftp://ftp.gw.com/pub/unix/tcsh/ \
9 ftp://ftp.funet.fi/pub/unix/shells/tcsh/ 9 ftp://ftp.funet.fi/pub/unix/shells/tcsh/
10 10
11MAINTAINER= kim@tac.nyc.ny.us 11MAINTAINER= kim@tac.nyc.ny.us
12HOMEPAGE= http://www.tcsh.org/Welcome 12HOMEPAGE= http://www.tcsh.org/Welcome
13COMMENT= Extended C-shell with many useful features 13COMMENT= Extended C-shell with many useful features
14 14
@@ -20,28 +20,26 @@ GNU_CONFIGURE= yes @@ -20,28 +20,26 @@ GNU_CONFIGURE= yes
20BUILD_TARGET= all catalogs 20BUILD_TARGET= all catalogs
21INSTALL_TARGET= install install.man 21INSTALL_TARGET= install install.man
22 22
23NLSDIR= share/nls 23NLSDIR= share/nls
24PLIST_SRC= ${WRKDIR}/PLIST-src 24PLIST_SRC= ${WRKDIR}/PLIST-src
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "SunOS" 28.if ${OPSYS} == "SunOS"
29OS_VER_cmd= ${ECHO} ${OS_VERSION} | ${SED} -e 's|5\.|2.|' 29OS_VER_cmd= ${ECHO} ${OS_VERSION} | ${SED} -e 's|5\.|2.|'
30LOWER_OPSYS= solaris${OS_VER_cmd:sh} 30LOWER_OPSYS= solaris${OS_VER_cmd:sh}
31.endif 31.endif
32 32
33CONFIGURE_ENV+= ac_cv_search_tgetent=${BUILDLINK_LDADD.termcap:Q} 
34 
35PKG_SHELL?= bin/tcsh 33PKG_SHELL?= bin/tcsh
36 34
37INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 35INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
38 36
39post-install: 37post-install:
40 @${ECHO} "Installing message catalogues" 38 @${ECHO} "Installing message catalogues"
41 cp ${PKGDIR:Q}/PLIST ${PLIST_SRC:Q} 39 cp ${PKGDIR:Q}/PLIST ${PLIST_SRC:Q}
42 set -e; \ 40 set -e; \
43 if [ -f ${WRKSRC:Q}/tcsh.C.cat ]; \ 41 if [ -f ${WRKSRC:Q}/tcsh.C.cat ]; \
44 then \ 42 then \
45 [ -d ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C ] || \ 43 [ -d ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C ] || \
46 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C;\ 44 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX:Q}/${NLSDIR:Q}/C;\
47 ${INSTALL_DATA} ${WRKSRC:Q}/tcsh.C.cat \ 45 ${INSTALL_DATA} ${WRKSRC:Q}/tcsh.C.cat \