pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/wdiff + Include termcap.buildlink3.mk instead...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d6982a16d64
branches:  trunk
changeset: 539428:9d6982a16d64
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 05 15:56:19 2008 +0000

description:
+ Include termcap.buildlink3.mk instead of using a custom (wrong) termcap
  detection method in the package Makefile.  Bump the PKGREVISION to 3.

+ Add full DESTDIR support.

diffstat:

 textproc/wdiff/Makefile |  23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diffs (50 lines):

diff -r f79e2fdbed76 -r 9d6982a16d64 textproc/wdiff/Makefile
--- a/textproc/wdiff/Makefile   Wed Mar 05 15:49:52 2008 +0000
+++ b/textproc/wdiff/Makefile   Wed Mar 05 15:56:19 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2007/12/23 04:50:30 minskim Exp $
+# $NetBSD: Makefile,v 1.17 2008/03/05 15:56:19 jlam Exp $
 #
 
 DISTNAME=              wdiff-0.5
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            textproc
 MASTER_SITES=          ${MASTER_SITE_GNU:=wdiff/}
 
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://www.gnu.org/software/wdiff/wdiff.html
 COMMENT=               Word-by-word diff
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 CONFIGURE_HAS_INFODIR= no
 CONFIGURE_HAS_MANDIR=  no
@@ -18,20 +20,15 @@
 INFO_FILES=            # PLIST
 INSTALLATION_DIRS=     bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/wdiff
 
-# pkgsrc does not provide libtermcap, but ncurses does provide
-# libtermcap routines.
-.if !exists(/usr/lib/libtermcap.so)
-BUILDLINK_TRANSFORM+=  l:termcap:ncurses
-.  include "../../devel/ncurses/buildlink3.mk"
-.endif
-
 do-install:
-       ${INSTALL_MAN} ${WRKSRC}/wdiff.1 ${PREFIX}/${PKGMANDIR}/man1
+       ${INSTALL_MAN} ${WRKSRC}/wdiff.1                                \
+               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        cd ${WRKSRC}; for f in wdiff.info wdiff.info-[0-9]*; do         \
                ${TEST} ! -f "$$f" ||                                   \
-               ${INSTALL_MAN} "$$f" ${PREFIX}/${PKGINFODIR};           \
+               ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \
        done
-       ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/wdiff
-       ${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wdiff
+       ${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${DESTDIR}${PREFIX}/bin
 
+.include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index