From 3dadaf3ff9c7ac4400b5fbad082732f1836edef1 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 29 May 2001 05:48:56 +0000 Subject: Use buildlink.mk to get readline dependency and use ${BUILDLINK_INCDIR} and ${BUILDLINK_LIBDIR} to find headers and libraries. Note that this package uses libtool with USE_LIBTOOL and LTCONFIG_OVERRIDE. Look for tputs() in libtermcap. Add patch to ensure that the proper LDFLAGS are passed when linking the executable. --- time/devtodo/Makefile | 20 +++++++++++++++----- time/devtodo/distinfo | 3 ++- time/devtodo/patches/patch-ac | 13 +++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 time/devtodo/patches/patch-ac diff --git a/time/devtodo/Makefile b/time/devtodo/Makefile index 7580319313d..c87feaa0752 100644 --- a/time/devtodo/Makefile +++ b/time/devtodo/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2001/05/15 06:54:23 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2001/05/29 05:48:56 jlam Exp $ # DISTNAME= devtodo-0.1.6-1 PKGNAME= devtodo-0.1.6.1 +WRKSRC= ${WRKDIR}/${DISTNAME:S/-1//} CATEGORIES= time MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=devtodo/} @@ -10,11 +11,20 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://sourceforge.net/projects/devtodo/ COMMENT= Display and manage a list of items that are outstanding -DEPENDS+= readline-[0-9]*:../../devel/readline +USE_LIBTOOL= # defined +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -WRKSRC= ${WRKDIR}/${DISTNAME:S/-1//} +GNU_CONFIGURE= # defined +CONFIGURE_ENV+= ac_cv_lib_ncurses_tputs=no +CONFIGURE_ENV+= ac_cv_lib_curses_tputs=no + +USE_GNU_READLINE= # uses rl_startup_hook() + +.include "../../devel/readline/buildlink.mk" + +CXXFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} -GNU_CONFIGURE= yes -MAKE_ENV+= CXXFLAGS="-Wl,-R${LOCALBASE}/lib" +pre-configure: ${BUILDLINK_TARGETS} .include "../../mk/bsd.pkg.mk" diff --git a/time/devtodo/distinfo b/time/devtodo/distinfo index b7b1f50a9c2..26ab3b803ef 100644 --- a/time/devtodo/distinfo +++ b/time/devtodo/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.4 2001/05/15 06:54:23 zuntum Exp $ +$NetBSD: distinfo,v 1.5 2001/05/29 05:48:56 jlam Exp $ SHA1 (devtodo-0.1.6-1.tar.gz) = 567a9102ba5569a8e77669f09fd58db1bc28ae80 Size (devtodo-0.1.6-1.tar.gz) = 165672 bytes SHA1 (patch-aa) = 9696d32bfaaec0650bbb75aad240e35ab2ca8656 SHA1 (patch-ab) = 6be42fb9d890b89e97fc3e443a9558040da0cb2d +SHA1 (patch-ac) = 18d7ed5fa238c80bd8dd15b65e675f24c47c6602 diff --git a/time/devtodo/patches/patch-ac b/time/devtodo/patches/patch-ac new file mode 100644 index 00000000000..60edc7497b9 --- /dev/null +++ b/time/devtodo/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2001/05/29 05:48:57 jlam Exp $ + +--- src/Makefile.in.orig Mon May 14 15:44:16 2001 ++++ src/Makefile.in Tue May 29 01:40:21 2001 +@@ -84,7 +84,7 @@ + LIBS = @READLINE_LIBS@ + + @DEBUG_FALSE@CPPFLAGS = -DNDEBUG +-@DEBUG_FALSE@LDFLAGS = -s ++@DEBUG_FALSE@LDFLAGS += -s + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = -- cgit v1.2.3