[pkgsrc/trunk]: pkgsrc/time/devtodo + Remove patch-aa which only changed the ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5fd8909075e
branches:  trunk
changeset: 539431:d5fd8909075e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 05 16:51:40 2008 +0000

description:
+ Remove patch-aa which only changed the directory into which the
  package installs the config file at installation time.  The simpler
  solution is to override sysconfdir via INSTALL_MAKE_FLAGS to point
  to the example files directory.

+ Instead of using custom termcap/curses detection/overriding logic
  in the package Makefile, simply allow termcap.buildlink3.mk (included
  indirectly via readline/buildlink3.mk) to do the right thing.  Bump
  the PKGREVISION to 1.

+ Add full DESTDIR support.

+ Simplify the post-install target.

diffstat:

 time/devtodo/Makefile         |  26 ++++++++++++--------------
 time/devtodo/distinfo         |   3 +--
 time/devtodo/patches/patch-aa |  14 --------------
 3 files changed, 13 insertions(+), 30 deletions(-)

diffs (83 lines):

diff -r 27381c94a340 -r d5fd8909075e time/devtodo/Makefile
--- a/time/devtodo/Makefile     Wed Mar 05 16:23:52 2008 +0000
+++ b/time/devtodo/Makefile     Wed Mar 05 16:51:40 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2007/12/01 16:52:09 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2008/03/05 16:51:40 jlam Exp $
 
 DISTNAME=      devtodo-0.1.20
+PKGREVISION=   1
 CATEGORIES=    time
 MASTER_SITES=  http://swapoff.org/files/devtodo/
 
@@ -8,17 +9,18 @@
 HOMEPAGE=      http://swapoff.org/DevTodo
 COMMENT=       Display and manage a list of items that are outstanding
 
-USE_LANGUAGES= c c++
-USE_LIBTOOL=   YES
-
-GNU_CONFIGURE= YES
+PKG_DESTDIR_SUPPORT=   user-destdir
 
-# We don't need curses, just termcap.
-CONFIGURE_ENV+=                ac_cv_lib_curses_tputs=no
+USE_LANGUAGES=         c c++
+USE_LIBTOOL=           yes
+USE_GNU_READLINE=      # uses rl_startup_hook()
+GNU_CONFIGURE=         yes
 
-USE_GNU_READLINE=      # uses rl_startup_hook()
+EGDIR=                 ${PREFIX}/share/examples/devtodo
+INSTALL_MAKE_FLAGS+=   sysconfdir=${EGDIR}
 
-CONTRIBFILES=  changelog2html                                          \
+post-install:
+.for CFILE in  changelog2html                                          \
                changelog2todo                                          \
                tdrec                                                   \
                todo-nodone-html.xslt                                   \
@@ -27,11 +29,7 @@
                todo2pdf.README                                         \
                todo2pdf.sh                                             \
                todo2pdf.xslt
-
-post-install:
-.for CFILE in ${CONTRIBFILES}
-       ${INSTALL_DATA} ${WRKSRC}/contrib/${CFILE}                      \
-               ${PREFIX}/share/examples/devtodo
+       ${INSTALL_DATA} ${WRKSRC}/contrib/${CFILE} ${DESTDIR}${EGDIR}
 .endfor
 
 .include "../../devel/readline/buildlink3.mk"
diff -r 27381c94a340 -r d5fd8909075e time/devtodo/distinfo
--- a/time/devtodo/distinfo     Wed Mar 05 16:23:52 2008 +0000
+++ b/time/devtodo/distinfo     Wed Mar 05 16:51:40 2008 +0000
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2007/12/01 16:52:09 rillig Exp $
+$NetBSD: distinfo,v 1.11 2008/03/05 16:51:40 jlam Exp $
 
 SHA1 (devtodo-0.1.20.tar.gz) = 003067a12139d712dbb3706069e0950a93ecaaf4
 RMD160 (devtodo-0.1.20.tar.gz) = 389201318faa5ff6d302bd5f8c8f8b094664b45c
 Size (devtodo-0.1.20.tar.gz) = 390935 bytes
-SHA1 (patch-aa) = 3a3d0acf6bd102e73fe6f280f4d62d950ce66183
 SHA1 (patch-ab) = 32844dec69a473020103c9fd3425c60042dadf35
 SHA1 (patch-ae) = 5f5ffb9571e73656eecdd3cb6cf72e26c193847e
diff -r 27381c94a340 -r d5fd8909075e time/devtodo/patches/patch-aa
--- a/time/devtodo/patches/patch-aa     Wed Mar 05 16:23:52 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2003/12/28 15:40:14 zuntum Exp $
-
---- doc/Makefile.in.orig       2002-12-26 05:14:54.000000000 +0100
-+++ doc/Makefile.in
-@@ -260,7 +260,8 @@ uninstall-man: uninstall-man1
- install-data-local:
-       mkdir -p $(DESTDIR)$(mandir)/man1
-       cd $(DESTDIR)$(mandir)/man1; for i in $(manlinks); do $(LN_S) -f devtodo.1 $$i.1; done
--      test -f $(DESTDIR)$(sysconfdir)/todorc || ( mkdir -p $(DESTDIR)$(sysconfdir) ; $(INSTALL_DATA) todorc.example $(DESTDIR)$(sysconfdir)/todorc )
-+      ${BSD_INSTALL_DATA_DIR} ${prefix}/share/examples/devtodo
-+      ${BSD_INSTALL_DATA} todorc.example ${prefix}/share/examples/devtodo/todorc
- 
- uninstall:
-       rm -f $(addprefix $(DESTDIR)$(mandir)/man1/, $(addsuffix .1, $(manlinks) devtodo))