Date: Mon, 21 Mar 2011 21:44:18 +0100 From: Matthias Andree <mandree@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: johans@FreeBSD.org Subject: ports/155761: [PATCH] editors/nvi: fix up Berkeley DB dependencies Message-ID: <E1Q1lxa-000OUh-A2@apollo.emma.line.org> Resent-Message-ID: <201103212050.p2LKo465018462@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 155761 >Category: ports >Synopsis: [PATCH] editors/nvi: fix up Berkeley DB dependencies >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 21 20:50:04 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD apollo.emma.line.org 8.2-RELEASE FreeBSD 8.2-RELEASE #65: Fri Feb 25 01:47:50 CET 2011 >Description: fix up Berkeley DB dependencies so that I can remove databases/db3 later Port maintainer (johans@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- nvi-1.81.6_4.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/editors/nvi-devel/Makefile,v retrieving revision 1.26 diff -u -u -r1.26 Makefile --- Makefile 4 Dec 2010 07:31:34 -0000 1.26 +++ Makefile 21 Mar 2011 19:24:05 -0000 @@ -7,7 +7,7 @@ PORTNAME= nvi PORTVERSION= 1.81.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/ @@ -23,10 +23,9 @@ USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_ICONV= yes -USE_BDB= 3 +USE_BDB= yes CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \ --program-prefix=n -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib" CONFIGURE_SCRIPT= ../dist/configure MAN1= nex.1 nvi.1 nview.1 @@ -36,10 +35,14 @@ CONFIGURE_ARGS+= --enable-widechar .endif +CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include +CONFIGURE_ENV+= LDFLAGS="-L${BDB_LIB_DIR} -L${LOCALBASE}/lib" + # configure is 555, so you can't do a "make configure" as non-root. post-patch: ${REINPLACE_CMD} -e 's,%%LIBTOOL%%,${LIBTOOL},g ; \ - s,%%LTMAIN%%,${LTMAIN},g' ${WRKSRC}/../dist/configure + s,%%LTMAIN%%,${LTMAIN},g ; \ + s,-ldb,-l${BDB_LIB_NAME},g' ${WRKSRC}/../dist/configure @${CHMOD} 755 ${WRKSRC}/../dist/configure post-install: Index: files/patch-configure =================================================================== RCS file: /home/ncvs/ports/editors/nvi-devel/files/patch-configure,v retrieving revision 1.5 diff -u -u -r1.5 patch-configure --- files/patch-configure 13 Mar 2010 18:16:15 -0000 1.5 +++ files/patch-configure 21 Mar 2011 19:10:43 -0000 @@ -39,34 +39,10 @@ int main () -@@ -28755,18 +28758,19 @@ - SAVELDFLAGS="$LDFLAGS" - if test "x$with_db_prefix" != "x"; then - LDFLAGS="-L$with_db_prefix/lib $LDFLAGS" -- CPPFLAGS="-I$with_db_prefix/include $CPPFLAGS" -+ CPPFLAGS="-I$with_db_prefix/include/db3 $CPPFLAGS" - fi - if test "$with_db_type" != db1; then - SAVELIBS="$LIBS" - -- LIBS="$LIBS -ldb" -+ LIBS="$LIBS -ldb3" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext +@@ -28755,5 +28758,6 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#include <sys/stddef.h> #include <db.h> int main () -@@ -28958,7 +28962,7 @@ - dl_src=../common/dldb.c - LIBS="-ldl $LIBS" - else -- LIBS="-ldb $LIBS" -+ LIBS="-ldb3 $LIBS" - if test "X$with_db_prefix" != "X"; then - LDFLAGS="`echo $with_db_prefix/lib | sed "$LRscript"` $LDFLAGS" - fi --- nvi-1.81.6_4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1Q1lxa-000OUh-A2>